Author: bapt
Date: Wed Jul 29 06:22:41 2015
New Revision: 285996
URL: https://svnweb.freebsd.org/changeset/base/285996
Log:
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
Modified:
head/usr.sbin/pw/Makefile
head/usr.sbin/pw/pw.c
head/usr.sbin/pw/pw.h
Modified: head/usr.sbin/pw/Makefile
==============================================================================
--- head/usr.sbin/pw/Makefile Wed Jul 29 03:06:08 2015 (r285995)
+++ head/usr.sbin/pw/Makefile Wed Jul 29 06:22:41 2015 (r285996)
@@ -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 \
- 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
Modified: head/usr.sbin/pw/pw.c
==============================================================================
--- head/usr.sbin/pw/pw.c Wed Jul 29 03:06:08 2015 (r285995)
+++ head/usr.sbin/pw/pw.c Wed Jul 29 06:22:41 2015 (r285996)
@@ -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])) {
- 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);
@@ -269,7 +269,7 @@ main(int argc, char *argv[])
}
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);
@@ -281,7 +281,7 @@ main(int argc, char *argv[])
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);
Modified: head/usr.sbin/pw/pw.h
==============================================================================
--- head/usr.sbin/pw/pw.h Wed Jul 29 03:06:08 2015 (r285995)
+++ head/usr.sbin/pw/pw.h Wed Jul 29 06:22:41 2015 (r285996)
@@ -32,6 +32,7 @@
#include <string.h>
#include <unistd.h>
#include <stdarg.h>
+#include <inttypes.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[];
+
+uintmax_t strtounum(const char *numstr, uintmax_t minval, uintmax_t maxval,
+ const char **errmsg);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
