From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 9 Jan 2024 19:54:38 +0000 (+0100)
Subject: src/: Use get_[ug]id() where appropriate
X-Git-Tag: 4.17.0-rc1~155
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ebdeb8f22aa124a56bf5be78e8d7276203836dba;p=thirdparty%2Fshadow.git

src/: Use get_[ug]id() where appropriate

Reviewed-by: "Serge E. Hallyn" <serge@hallyn.com>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---

diff --git a/src/check_subid_range.c b/src/check_subid_range.c
index 68266f558..35ecf12a8 100644
--- a/src/check_subid_range.c
+++ b/src/check_subid_range.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
+#include "atoi/getnum.h"
 #include "atoi/str2i.h"
 #include "defines.h"
 #include "prototypes.h"
@@ -20,13 +21,18 @@
 #include "idmapping.h"
 #include "shadowlog.h"
 
+
 static const char Prog[] = "check_subid_range";
 
-int main(int argc, char **argv)
+
+int
+main(int argc, char **argv)
 {
-	char *owner;
-	unsigned long start, count;
-	bool check_uids;
+	bool           check_uids;
+	char           *owner;
+	uid_t          start;
+	unsigned long  count;
+
 	log_set_progname(Prog);
 	log_set_logfd(stderr);
 
@@ -36,7 +42,7 @@ int main(int argc, char **argv)
 	owner = argv[1];
 	check_uids = argv[2][0] == 'u';
 	errno = 0;
-	if (str2ul(&start, argv[3]) == -1)
+	if (get_uid(argv[3], &start) == -1)
 		exit(1);
 	if (str2ul(&count, argv[4]) == -1)
 		exit(1);
diff --git a/src/get_subid_owners.c b/src/get_subid_owners.c
index 1200bcb06..593d6f1ce 100644
--- a/src/get_subid_owners.c
+++ b/src/get_subid_owners.c
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 
-#include "atoi/str2i.h"
+#include "atoi/getnum.h"
 #include "subid.h"
 #include "stdlib.h"
 #include "prototypes.h"
@@ -33,12 +33,12 @@ int main(int argc, char *argv[])
 		usage();
 	}
 	if (argc == 3 && strcmp(argv[1], "-g") == 0) {
-		str2i(uid_t, &u, argv[2]);
+		get_uid(argv[2], &u);
 		n = subid_get_gid_owners(u, &uids);
 	} else if (argc == 2 && strcmp(argv[1], "-h") == 0) {
 		usage();
 	} else {
-		str2i(uid_t, &u, argv[1]);
+		get_gid(argv[1], &u);
 		n = subid_get_uid_owners(u, &uids);
 	}
 	if (n < 0) {