Changed bb_regcomp to xregcomp and #if 0'ed out destroy_cmd_strs in sed.c

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index c0e380a8ebc7451e5ed1ad19e10167babf60e94f..98b292568cdfc8cff4a2f434d43da44fbabe84c2 100644 (file)
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -25,6 +25,7 @@
 #include "internal.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
+#define bb_need_too_few_args
 #include "messages.c"
 
 #include <stdio.h>
@@ -35,7 +36,6 @@
 static unsigned long uid = -1;
 static unsigned long gid = -1;
 static int whichApp;
-static char *invocationName = NULL;
 static char *theMode = NULL;
 
 
@@ -87,7 +87,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
        case CHMOD_APP:
                /* Parse the specified modes */
                if (parse_mode(theMode, &(statbuf->st_mode)) == FALSE) {
-                       fatalError( "%s: unknown mode: %s\n", invocationName, theMode);
+                       fatalError( "unknown mode: %s\n", theMode);
                }
                if (chmod(fileName, statbuf->st_mode) == 0)
                        return (TRUE);
@@ -100,12 +100,12 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 int chmod_chown_chgrp_main(int argc, char **argv)
 {
        int recursiveFlag = FALSE;
-       char *groupName;
-       char *p;
+       char *groupName=NULL;
+       char *p=NULL;
        const char *appUsage;
 
-       whichApp = (strcmp(*argv, "chown") == 0)? 
-                       CHOWN_APP : (strcmp(*argv, "chmod") == 0)? 
+       whichApp = (strcmp(applet_name, "chown") == 0)? 
+                       CHOWN_APP : (strcmp(applet_name, "chmod") == 0)? 
                                CHMOD_APP : CHGRP_APP;
 
        appUsage = (whichApp == CHOWN_APP)? 
@@ -113,25 +113,28 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 
        if (argc < 2)
                usage(appUsage);
-       invocationName = *argv;
-       argc--;
        argv++;
 
        /* Parse options */
-       while (argc && (**argv == '-')) {
-               while (*++(*argv))
+       while (--argc >= 0 && *argv && (**argv == '-')) {
+               while (*++(*argv)) {
                        switch (**argv) {
-                       case 'R':
-                               recursiveFlag = TRUE;
-                               break;
-                       default:
-                               fprintf(stderr, invalid_option, invocationName, **argv);
-                               usage(appUsage);
+                               case 'R':
+                                       recursiveFlag = TRUE;
+                                       break;
+                               default:
+                                       fprintf(stderr, invalid_option, applet_name, **argv);
+                                       usage(appUsage);
                        }
-               argc--;
+               }
                argv++;
        }
 
+       if (argc == 0 || *argv == NULL) {
+               fprintf(stderr, too_few_args, applet_name);
+               usage(appUsage);
+       }
+
        if (whichApp == CHMOD_APP) {
                theMode = *argv;
        } else {
@@ -166,15 +169,14 @@ int chmod_chown_chgrp_main(int argc, char **argv)
                        if (*argv == p)
                                uid = my_getpwnam(*argv);
                        if (uid == -1) {
-                               fatalError( "%s: unknown user name: %s\n", 
-                                               invocationName, *argv);
+                               fatalError( "unknown user name: %s\n", *argv);
                        }
                }
        }
 
        /* Ok, ready to do the deed now */
        if (argc <= 1) {
-               fatalError( "%s: too few arguments\n", invocationName);
+               fatalError( "too few arguments\n");
        }
        while (argc-- > 1) {
                if (recursiveAction (*(++argv), recursiveFlag, FALSE, FALSE, 
@@ -184,7 +186,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
        exit(TRUE);
 
   bad_group:
-       fatalError( "%s: unknown group name: %s\n", invocationName, groupName);
+       fatalError( "unknown group name: %s\n", groupName);
 }
 
 /*