Patch from Larry Doolittle to cross things in multibuild.pl

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index cf6a508950a3bb13ed9cc312163a9f73d4925ec0..9363bd757b701e12a553673cd28bd4cc9c3edd32 100644 (file)
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -3,7 +3,7 @@
  * Mini chown/chmod/chgrp implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,19 +22,20 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
 #define bb_need_too_few_args
 #include "messages.c"
 
 #include <stdio.h>
-#include <grp.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 
-static unsigned long uid = -1;
-static unsigned long gid = -1;
+static long uid = -1;
+static long gid = -1;
 static int whichApp;
 static char *theMode = NULL;
 
@@ -43,29 +44,6 @@ static char *theMode = NULL;
 #define CHOWN_APP   2
 #define CHMOD_APP   3
 
-static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nChange the group membership of each FILE to GROUP.\n"
-       "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-       ;
-static const char chown_usage[] =
-       "chown [OPTION]...  OWNER[<.|:>[GROUP] FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-       "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-       ;
-static const char chmod_usage[] =
-       "chmod [-R] MODE[,MODE]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-       "\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-       "one or more of the letters rwxst.\n\n"
-       "\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-       ;
-
-
 static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 {
        switch (whichApp) {
@@ -87,7 +65,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", theMode);
                }
                if (chmod(fileName, statbuf->st_mode) == 0)
                        return (TRUE);
@@ -99,44 +77,43 @@ 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;
-       const char *appUsage;
-
-       whichApp = (strcmp(applet_name, "chown") == 0)? 
-                       CHOWN_APP : (strcmp(applet_name, "chmod") == 0)? 
-                               CHMOD_APP : CHGRP_APP;
 
-       appUsage = (whichApp == CHOWN_APP)? 
-                       chown_usage : (whichApp == CHMOD_APP) ? chmod_usage : chgrp_usage;
+       whichApp = (applet_name[2]=='o')?           /* chown */
+               CHOWN_APP : (applet_name[2]=='m')?      /* chmod */
+               CHMOD_APP : CHGRP_APP;
 
        if (argc < 2)
-               usage(appUsage);
+               show_usage();
        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 */
@@ -169,24 +146,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", *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", groupName);
 }
 
 /*