Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/bin/ps use parsenum like everywhere else in the code.



details:   https://anonhg.NetBSD.org/src/rev/e4e88158729b
branches:  trunk
changeset: 983758:e4e88158729b
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jun 04 22:39:41 2021 +0000

description:
use parsenum like everywhere else in the code.

diffstat:

 bin/ps/ps.c |  19 ++++++-------------
 1 files changed, 6 insertions(+), 13 deletions(-)

diffs (51 lines):

diff -r a74e686e8300 -r e4e88158729b bin/ps/ps.c
--- a/bin/ps/ps.c       Fri Jun 04 21:12:10 2021 +0000
+++ b/bin/ps/ps.c       Fri Jun 04 22:39:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ps.c,v 1.95 2021/06/04 08:17:53 wiz Exp $      */
+/*     $NetBSD: ps.c,v 1.96 2021/06/04 22:39:41 christos Exp $ */
 
 /*
  * Copyright (c) 2000-2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
 #if 0
 static char sccsid[] = "@(#)ps.c       8.4 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: ps.c,v 1.95 2021/06/04 08:17:53 wiz Exp $");
+__RCSID("$NetBSD: ps.c,v 1.96 2021/06/04 22:39:41 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -257,20 +257,13 @@
                case 'G':
                        if (*optarg != '\0') {
                                struct group *gr;
-                               char *ep;
                                
                                what = KERN_PROC_GID;
                                gr = getgrnam(optarg);
                                if (gr == NULL) {
-                                       errno = 0;
-                                       flag = strtoul(optarg, &ep, 10);
-                                       if (errno)
-                                               err(1, "%s", optarg);
-                                       if (*ep != '\0')
-                                               errx(1, "%s: illegal group",
-                                                       optarg);
-                                       } else
-                                               flag = gr->gr_gid;
+                                       flag = parsenum(optarg, "group id");
+                               } else
+                                       flag = gr->gr_gid;
                        }
                        break;
 
@@ -359,7 +352,7 @@
                                what = KERN_PROC_UID;
                                pw = getpwnam(optarg);
                                if (pw == NULL) {
-                                       flag = parsenum(optarg, "user name");
+                                       flag = parsenum(optarg, "user id");
                                } else
                                        flag = pw->pw_uid;
                        }



Home | Main Index | Thread Index | Old Index