Some corrections, some additions, some embellishments.

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index c02f2a3cb26fb108a1a32fafc4360e129b646270..530c45658b5a2c26680a1799ddc6cf202a7f5a9e 100644 (file)
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -22,7 +22,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
 #define bb_need_too_few_args
@@ -64,7 +64,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( "unknown mode: %s\n", theMode);
+                       error_msg_and_die( "unknown mode: %s\n", theMode);
                }
                if (chmod(fileName, statbuf->st_mode) == 0)
                        return (TRUE);
@@ -76,6 +76,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 
 int chmod_chown_chgrp_main(int argc, char **argv)
 {
+       int stopIt = FALSE;
        int recursiveFlag = FALSE;
        char *groupName=NULL;
        char *p=NULL;
@@ -94,26 +95,28 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 
        /* Parse options */
        while (--argc >= 0 && *argv && (**argv == '-')) {
-               while (*++(*argv)) {
+               while (stopIt==FALSE && *++(*argv)) {
                        switch (**argv) {
                                case 'R':
                                        recursiveFlag = TRUE;
                                        break;
                                default:
-                                       errorMsg(invalid_option, **argv);
-                                       usage(appUsage);
+                                       theMode=*argv-1;
+                                       stopIt = TRUE;
                        }
                }
+               if (stopIt==TRUE)
+                       break;
                argv++;
        }
 
        if (argc == 0 || *argv == NULL) {
-               errorMsg(too_few_args);
-               usage(appUsage);
+               error_msg(too_few_args);
        }
 
        if (whichApp == CHMOD_APP) {
-               theMode = *argv;
+               if (theMode==NULL)
+                       theMode = *argv;
        } else {
 
                /* Find the selected group */
@@ -146,24 +149,24 @@ int chmod_chown_chgrp_main(int argc, char **argv)
                        if (*argv == p)
                                uid = my_getpwnam(*argv);
                        if (uid == -1) {
-                               fatalError( "unknown user name: %s\n", *argv);
+                               error_msg_and_die( "unknown user name: %s\n", *argv);
                        }
                }
        }
 
        /* Ok, ready to do the deed now */
-       if (argc <= 1) {
-               fatalError(too_few_args);
+       if (argc < 1) {
+               error_msg_and_die(too_few_args);
        }
        while (argc-- > 1) {
-               if (recursiveAction (*(++argv), recursiveFlag, FALSE, FALSE, 
+               if (recursive_action (*(++argv), recursiveFlag, FALSE, FALSE, 
                                        fileAction, fileAction, NULL) == FALSE)
-                       exit(FALSE);
+                       return EXIT_FAILURE;
        }
-       exit(TRUE);
+       return EXIT_SUCCESS;
 
   bad_group:
-       fatalError( "unknown group name: %s\n", groupName);
+       error_msg_and_die( "unknown group name: %s\n", groupName);
 }
 
 /*