Create a strtounum function using the same API as strtonum

This function returns uintmax_t
Use this function to convert to gid_t/uid_t

diff --git a/pw/Makefile b/pw/Makefile
index c265399730c7d4ccddab22ae1acfcc9376842957..87bb5f68e3d684d2a12bc0423eb79b2fefc6ba0c 100644 (file)
--- a/pw/Makefile
+++ b/pw/Makefile
@@ -3,7 +3,7 @@
 PROG=  pw
 MAN=   pw.conf.5 pw.8
 SRCS=  pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \
 PROG=  pw
 MAN=   pw.conf.5 pw.8
 SRCS=  pw.c pw_conf.c pw_user.c pw_group.c pw_log.c pw_nis.c pw_vpw.c \

-       grupd.c pwupd.c psdate.c bitmap.c cpdir.c rm_r.c
+       grupd.c pwupd.c psdate.c bitmap.c cpdir.c rm_r.c strtounum.c

 
 WARNS?=        3
 
 
 WARNS?=        3
 

diff --git a/pw/pw.c b/pw/pw.c
index c1d9cd32a708527c6c37ea23a46f0f36ab27aae6..88c83dbfa125a5cdda983d620d2a555ab774c6c0 100644 (file)
--- a/pw/pw.c
+++ b/pw/pw.c
@@ -199,7 +199,7 @@ main(int argc, char *argv[])
                        cmdhelp(mode, which);
                else if (which != -1 && mode != -1) {
                        if (strspn(argv[1], "0123456789") == strlen(argv[1])) {
                        cmdhelp(mode, which);
                else if (which != -1 && mode != -1) {
                        if (strspn(argv[1], "0123456789") == strlen(argv[1])) {

-                               id = strtonum(argv[1], 0, LONG_MAX, &errstr);
+                               id = strtounum(argv[1], 0, UID_MAX, &errstr);

                                if (errstr != NULL)
                                        errx(EX_USAGE, "Bad id '%s': %s",
                                            argv[1], errstr);
                                if (errstr != NULL)
                                        errx(EX_USAGE, "Bad id '%s': %s",
                                            argv[1], errstr);


@@ -269,7 +269,7 @@ main(int argc, char *argv[])
                        }
                        if (strspn(optarg, "0123456789") != strlen(optarg))
                                errx(EX_USAGE, "-g expects a number");
                        }
                        if (strspn(optarg, "0123456789") != strlen(optarg))
                                errx(EX_USAGE, "-g expects a number");

-                       id = strtonum(optarg, 0, GID_MAX, &errstr);
+                       id = strtounum(optarg, 0, GID_MAX, &errstr);

                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
                                    errstr);
                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
                                    errstr);


@@ -281,7 +281,7 @@ main(int argc, char *argv[])
                                addarg(&arglist, 'u', optarg);
                                break;
                        }
                                addarg(&arglist, 'u', optarg);
                                break;
                        }

-                       id = strtonum(optarg, 0, UID_MAX, &errstr);
+                       id = strtounum(optarg, 0, UID_MAX, &errstr);

                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
                                    errstr);
                        if (errstr != NULL)
                                errx(EX_USAGE, "Bad id '%s': %s", optarg,
                                    errstr);

diff --git a/pw/pw.h b/pw/pw.h
index ed3b7158e907fdc56656bd1a498866b0683e21b8..3ab3c74a953725ee47536f9dfc50f4a872952ed2 100644 (file)
--- a/pw/pw.h
+++ b/pw/pw.h
@@ -32,6 +32,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdarg.h>

+#include <inttypes.h>

 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/stat.h>


@@ -101,3 +102,6 @@ char *pw_pwcrypt(char *password);
 
 extern const char *Modes[];
 extern const char *Which[];
 
 extern const char *Modes[];
 extern const char *Which[];

+
+uintmax_t strtounum(const char *numstr, uintmax_t minval, uintmax_t maxval,
+    const char **errmsg);