install correct aliases file

[unix-history] / usr / src / usr.sbin / chown / chgrp.c

diff --git a/usr/src/usr.sbin/chown/chgrp.c b/usr/src/usr.sbin/chown/chgrp.c
index 2d6861d..f33d495 100644 (file)
--- a/usr/src/usr.sbin/chown/chgrp.c
+++ b/usr/src/usr.sbin/chown/chgrp.c
@@ -5,7 +5,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)chgrp.c    5.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)chgrp.c    5.9 (Berkeley) %G%";

 #endif not lint
 
 /*
 #endif not lint
 
 /*


@@ -34,19 +34,24 @@ main(argc, argv)
        char *argv[];
 {
        register c, i;
        char *argv[];
 {
        register c, i;

-       register char *flags;
+       register char *cp;

 
        argc--, argv++;
 
        argc--, argv++;

-       if (*argv[0] == '-') {
-               for (flags = argv[0]; *flags; ++flags)
-                       switch (*flags) {
-                         case '-':                     break;
-                         case 'f':     fflag++;        break;
-                         case 'R':     rflag++;        break;
-                         default:
-                               printf("chgrp: unknown option: %s\n", *flags);
-                               exit(255);
-                       }
+       while (argc > 0 && argv[0][0] == '-') {
+               for (cp = &argv[0][1]; *cp; cp++) switch (*cp) {
+
+               case 'f':
+                       fflag++;
+                       break;
+
+               case 'R':
+                       rflag++;
+                       break;
+
+               default:
+                       fatal(255, "unknown option: %c", *cp);
+                       /*NOTREACHED*/
+               }

                argv++, argc--;
        }
        if (argc < 2) {
                argv++, argc--;
        }
        if (argc < 2) {


@@ -57,51 +62,44 @@ main(argc, argv)
        if (isnumber(argv[0])) {
                gid = atoi(argv[0]);
                gr = getgrgid(gid);
        if (isnumber(argv[0])) {
                gid = atoi(argv[0]);
                gr = getgrgid(gid);

-               if (uid && gr == NULL) {
-                       fprintf(stderr, "%s: unknown group\n", argv[0]);
-                       exit(255);
-               }
+               if (uid && gr == NULL)
+                       fatal(255, "%s: unknown group", argv[0]);

        } else {
                gr = getgrnam(argv[0]);
        } else {
                gr = getgrnam(argv[0]);

-               if (gr == NULL) {
-                       fprintf(stderr, "%s: unknown group\n", argv[0]);
-                       exit(255);
-               }
+               if (gr == NULL)
+                       fatal(255, "%s: unknown group", argv[0]);

                gid = gr->gr_gid;
        }
        pwd = getpwuid(uid);
                gid = gr->gr_gid;
        }
        pwd = getpwuid(uid);

-       if (pwd == NULL) {
-               fprintf(stderr, "Who are you?\n");
-               exit(255);
-       }
+       if (pwd == NULL)
+               fatal(255, "Who are you?");

        if (uid && pwd->pw_gid != gid) {
                for (i=0; gr->gr_mem[i]; i++)
                        if (!(strcmp(pwd->pw_name, gr->gr_mem[i])))
                                goto ok;
                if (fflag)
                        exit(0);
        if (uid && pwd->pw_gid != gid) {
                for (i=0; gr->gr_mem[i]; i++)
                        if (!(strcmp(pwd->pw_name, gr->gr_mem[i])))
                                goto ok;
                if (fflag)
                        exit(0);

-               fprintf(stderr, "You are not a member of the %s group.\n",
-                               argv[0]);
-               exit(255);
+               fatal(255, "You are not a member of the %s group", argv[0]);

        }
 ok:
        for (c = 1; c < argc; c++) {
        }
 ok:
        for (c = 1; c < argc; c++) {

+               /* do stat for directory arguments */

                if (lstat(argv[c], &stbuf)) {
                if (lstat(argv[c], &stbuf)) {

-                       perror(argv[c]);
+                       status += Perror(argv[c]);

                        continue;
                }
                if (uid && uid != stbuf.st_uid) {
                        continue;
                }
                if (uid && uid != stbuf.st_uid) {

-                       if (fflag)
-                               continue;
-                       fprintf(stderr, "You are not the owner of %s\n"
-                                     , argv[c]);
-                       ++status;
+                       status += error("You are not the owner of %s", argv[c]);
+                       continue;
+               }
+               if (rflag && ((stbuf.st_mode & S_IFMT) == S_IFDIR)) {
+                       status += chownr(argv[c]);
+                       continue;
+               }
+               if (chown(argv[c], -1, gid)) {
+                       status += Perror(argv[c]);

                        continue;
                }
                        continue;
                }

-               if (rflag && stbuf.st_mode & S_IFDIR)
-                       status += chownr(argv[c], stbuf.st_uid, gid);
-               else if (chown(argv[c], stbuf.st_uid, gid) && !fflag)
-                       perror(argv[c]);

        }
        exit(status);
 }
        }
        exit(status);
 }


@@ -117,45 +115,90 @@ isnumber(s)
        return (1);
 }
 
        return (1);
 }
 

-chownr(dir, uid, gid)
-       char    *dir;
+chownr(dir)
+       char *dir;

 {
 {

-       register DIR            *dirp;
-       register struct direct  *dp;
-       register struct stat    st;
-       char                    savedir[1024];
+       register DIR *dirp;
+       register struct direct *dp;
+       struct stat st;
+       char savedir[1024];
+       int ecode;

 
 

-       if (getwd(savedir) == 0) {
-               fprintf(stderr, "chgrp: %s\n", savedir);
-               exit(255);
-       }
-       if (chown(dir, uid, gid) < 0 && !fflag) {
-               perror(dir);
-               return(1);
+       if (getwd(savedir) == 0)
+               fatal(255, "%s", savedir);
+       /*
+        * Change what we are given before doing its contents.
+        */
+       if (chown(dir, -1, gid) < 0 && Perror(dir))
+               return (1);
+       if (chdir(dir) < 0) {
+               Perror(dir);
+               return (1);

        }
        }

-
-       chdir(dir);

        if ((dirp = opendir(".")) == NULL) {
        if ((dirp = opendir(".")) == NULL) {

-               perror(dir);
-               exit(status);
+               Perror(dir);
+               return (1);

        }
        dp = readdir(dirp);
        dp = readdir(dirp); /* read "." and ".." */
        }
        dp = readdir(dirp);
        dp = readdir(dirp); /* read "." and ".." */

-
+       ecode = 0;

        for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
                if (lstat(dp->d_name, &st) < 0) {
        for (dp = readdir(dirp); dp != NULL; dp = readdir(dirp)) {
                if (lstat(dp->d_name, &st) < 0) {

-                       fprintf(stderr, "chgrp: can't access %s\n", dp->d_name);
-                       return(1);
+                       ecode = Perror(dp->d_name);
+                       if (ecode)
+                               break;
+                       continue;
+               }
+               if (uid && uid != st.st_uid) {
+                       ecode = error("You are not the owner of %s",
+                               dp->d_name);
+                       continue;
+               }
+               if ((st.st_mode & S_IFMT) == S_IFDIR) {
+                       ecode = chownr(dp->d_name);
+                       if (ecode)
+                               break;
+                       continue;

                }
                }

-               if (st.st_mode & S_IFDIR)
-                       chownr(dp->d_name, st.st_uid, gid);
-               else
-                       if (chown(dp->d_name, st.st_uid, gid) < 0 && !fflag) {
-                               perror(dp->d_name);
-                               return(1);
-                       }
+               if (chown(dp->d_name, -1, gid) < 0 &&
+                   (ecode = Perror(dp->d_name)))
+                       break;

        }
        closedir(dirp);
        }
        closedir(dirp);

-       chdir(savedir);
-       return(0);
+       if (chdir(savedir) < 0)
+               fatal(255, "can't change back to %s", savedir);
+       return (ecode);
+}
+
+error(fmt, a)
+       char *fmt, *a;
+{
+
+       if (!fflag) {
+               fprintf(stderr, "chgrp: ");
+               fprintf(stderr, fmt, a);
+               putc('\n', stderr);
+       }
+       return (!fflag);
+}
+
+fatal(status, fmt, a)
+       int status;
+       char *fmt, *a;
+{
+
+       fflag = 0;
+       (void) error(fmt, a);
+       exit(status);
+}
+
+Perror(s)
+       char *s;
+{
+
+       if (!fflag) {
+               fprintf(stderr, "chgrp: ");
+               perror(s);
+       }
+       return (!fflag);

 }
 }