file_cmds-321.100.10.0.1.tar.gz

[apple/file_cmds.git] / chown / chown.c

diff --git a/chown/chown.c b/chown/chown.c
index 8391f7a78d091a19e81fe891e387de612c76d60e..708a6c55b98972f965d74dcc145853017b92bc6e 100644 (file)
--- a/chown/chown.c
+++ b/chown/chown.c
@@ -31,8 +31,9 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-static const char copyright[] =
+__used static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993, 1994\n\
        The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
@@ -69,12 +70,15 @@ __RCSID("$FreeBSD: src/usr.sbin/chown/chown.c,v 1.24 2002/07/17 16:22:24 dwmalon
 void   a_gid(const char *);
 void   a_uid(const char *);
 void   chownerr(const char *);
-u_long id(const char *, const char *);
+static uid_t   id(const char *, const char *);
 void   usage(void);
 
 uid_t uid;
 gid_t gid;
 int ischown;
+#ifdef __APPLE__
+int isnumeric = 0;
+#endif
 const char *gname;
 
 int
@@ -95,7 +99,11 @@ main(int argc, char **argv)
        ischown = (strcmp(cp, "chown") == 0);
 
        Hflag = Lflag = Pflag = Rflag = fflag = hflag = vflag = 0;
+#ifdef __APPLE__
+       while ((ch = getopt(argc, argv, "HLPRfhnv")) != -1)
+#else
        while ((ch = getopt(argc, argv, "HLPRfhv")) != -1)
+#endif
                switch (ch) {
                case 'H':
                        Hflag = 1;
@@ -118,6 +126,11 @@ main(int argc, char **argv)
                case 'h':
                        hflag = 1;
                        break;
+#ifdef __APPLE__
+               case 'n':
+                       isnumeric = 1;
+                       break;
+#endif
                case 'v':
                        vflag = 1;
                        break;
@@ -245,7 +258,11 @@ a_gid(const char *s)
        if (*s == '\0')                 /* Argument was "uid[:.]". */
                return;
        gname = s;
+#ifdef __APPLE__
+       gid = (!isnumeric && ((gr = getgrnam(s)) != NULL)) ? gr->gr_gid : id(s, "group");
+#else
        gid = ((gr = getgrnam(s)) != NULL) ? gr->gr_gid : id(s, "group");
+#endif
 }
 
 void
@@ -255,26 +272,24 @@ a_uid(const char *s)
 
        if (*s == '\0')                 /* Argument was "[:.]gid". */
                return;
+#ifdef __APPLE__
+       uid = (!isnumeric && ((pw = getpwnam(s)) != NULL)) ? pw->pw_uid : id(s, "user");
+#else
        uid = ((pw = getpwnam(s)) != NULL) ? pw->pw_uid : id(s, "user");
+#endif
 }
 
-u_long
+static uid_t
 id(const char *name, const char *type)
 {
-       u_long val;
+       unsigned long val;
        char *ep;
 
-       /*
-        * XXX
-        * We know that uid_t's and gid_t's are unsigned longs.
-        */
        errno = 0;
        val = strtoul(name, &ep, 10);
-       if (errno)
-               err(1, "%s", name);
-       if (*ep != '\0')
+       if (errno || *ep != '\0' || val > UID_MAX)
                errx(1, "%s: illegal %s name", name, type);
-       return (val);
+       return (uid_t)val;
 }
 
 void
@@ -310,11 +325,21 @@ usage(void)
 
        if (ischown)
                (void)fprintf(stderr, "%s\n%s\n",
+#ifdef __APPLE__
+                   "usage: chown [-fhnv] [-R [-H | -L | -P]] owner[:group]"
+                   " file ...",
+                   "       chown [-fhnv] [-R [-H | -L | -P]] :group file ...");
+#else
                    "usage: chown [-fhv] [-R [-H | -L | -P]] owner[:group]"
                    " file ...",
                    "       chown [-fhv] [-R [-H | -L | -P]] :group file ...");
+#endif
        else
                (void)fprintf(stderr, "%s\n",
+#ifdef __APPLE__
+                   "usage: chgrp [-fhnv] [-R [-H | -L | -P]] group file ...");
+#else
                    "usage: chgrp [-fhv] [-R [-H | -L | -P]] group file ...");
+#endif
        exit(1);
 }