Making note of my changes

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index a91b0a365e8e6e63569d8df63b428103e8702dd7..75db904e866d094bc32f1099ccbd3c096dc84b55 100644 (file)
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -31,23 +31,23 @@ static uid_t uid=-1;
 static gid_t gid=-1;
 static int whichApp;
 static char* invocationName=NULL;
-static mode_t mode=0644;
+static char* theMode=NULL;
 
 
 #define CHGRP_APP   1
 #define CHOWN_APP   2
 #define CHMOD_APP   3
 
-static const char chgrp_usage[] = "[OPTION]... GROUP FILE...\n"
+static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n\n"
     "Change the group membership of each FILE to GROUP.\n"
-    "\n\tOptions:\n" "\t-R\tchange files and directories recursively\n";
-static const char chown_usage[] = "[OPTION]...  OWNER[.[GROUP] FILE...\n"
+    "\nOptions:\n\t-R\tchange files and directories recursively\n";
+static const char chown_usage[] = "chown [OPTION]...  OWNER[.[GROUP] FILE...\n\n"
     "Change the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-    "\n\tOptions:\n" "\t-R\tchange files and directories recursively\n";
-static const char chmod_usage[] = "[-R] MODE[,MODE]... FILE...\n"
+    "\nOptions:\n\t-R\tchange files and directories recursively\n";
+static const char chmod_usage[] = "chmod [-R] MODE[,MODE]... FILE...\n\n"
 "Each MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
 "one or more of the letters rwxst.\n\n"
- "\t-R\tchange files and directories recursively.\n";
+ "\nOptions:\n\t-R\tchange files and directories recursively.\n";
 
 
 static int fileAction(const char *fileName, struct stat* statbuf)
@@ -55,13 +55,18 @@ static int fileAction(const char *fileName, struct stat* statbuf)
     switch (whichApp) {
        case CHGRP_APP:
        case CHOWN_APP:
-           if (chown(fileName, (whichApp==CHOWN_APP)? uid : statbuf->st_uid, 
+           if (lchown(fileName, (whichApp==CHOWN_APP)? uid : statbuf->st_uid, 
                        (gid==-1)? statbuf->st_gid : gid) == 0) {
                return( TRUE);
            }
            break;
        case CHMOD_APP:
-           if (chmod(fileName, mode) == 0)
+           /* Parse the specified modes */
+           if ( parse_mode(theMode, &(statbuf->st_mode)) == FALSE ) {
+               fprintf(stderr, "%s: Unknown mode: %s\n", invocationName, theMode);
+               exit( FALSE);
+           }
+           if (chmod(fileName, statbuf->st_mode) == 0)
                return( TRUE);
            break;
     }
@@ -73,14 +78,14 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 {
     int recursiveFlag=FALSE;
     char *groupName;
+    const char *appUsage;
 
     whichApp = (strcmp(*argv, "chown")==0)? CHOWN_APP : (strcmp(*argv, "chmod")==0)? CHMOD_APP : CHGRP_APP; 
 
-    if (argc < 2) {
-       fprintf(stderr, "Usage: %s %s", *argv, 
-               (whichApp==TRUE)? chown_usage : chgrp_usage);
-       exit( FALSE);
-    }
+    appUsage = (whichApp==CHOWN_APP)? chown_usage : (whichApp==CHMOD_APP)? chmod_usage : chgrp_usage;
+
+    if (argc < 2) 
+       usage( appUsage);
     invocationName=*argv;
     argc--;
     argv++;
@@ -93,19 +98,14 @@ int chmod_chown_chgrp_main(int argc, char **argv)
                break;
            default:
                fprintf(stderr, "Unknown option: %c\n", **argv);
-               exit( FALSE);
+               usage( appUsage);
        }
        argc--;
        argv++;
     }
     
     if ( whichApp == CHMOD_APP ) {
-       /* Find the specified modes */
-       mode = ( 0 & (S_ISVTX|S_ISUID|S_ISGID|S_IRWXU|S_IRWXG|S_IRWXO));
-       if ( parse_mode(*argv, &mode) == FALSE ) {
-           fprintf(stderr, "%s: Unknown mode: %s\n", invocationName, *argv);
-           exit( FALSE);
-       }
+       theMode=*argv;
     } else {
 
        /* Find the selected group */