Apply a patch from Evin Robertson -- new pivot_root applet.

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index e8ccb8156974e9c62acced52b92d4d2e9812b329..81db1015188ae1d93e19f01cdcd6544dfac5dd84 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
@@ -29,8 +29,9 @@
 #include "messages.c"
 
 #include <stdio.h>
-#include <grp.h>
-#include <pwd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 
 
 static long uid = -1;
@@ -64,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);
@@ -82,9 +83,9 @@ int chmod_chown_chgrp_main(int argc, char **argv)
        char *p=NULL;
        const char *appUsage;
 
-       whichApp = (strcmp(applet_name, "chown") == 0)? 
-                       CHOWN_APP : (strcmp(applet_name, "chmod") == 0)? 
-                               CHMOD_APP : CHGRP_APP;
+       whichApp = (applet_name[2]=='o')?           /* chown */
+               CHOWN_APP : (applet_name[2]=='m')?      /* chmod */
+               CHMOD_APP : CHGRP_APP;
 
        appUsage = (whichApp == CHOWN_APP)? 
                        chown_usage : (whichApp == CHMOD_APP) ? chmod_usage : chgrp_usage;
@@ -111,7 +112,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
        }
 
        if (argc == 0 || *argv == NULL) {
-               errorMsg(too_few_args);
+               error_msg(too_few_args);
        }
 
        if (whichApp == CHMOD_APP) {
@@ -149,24 +150,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);
+               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)
                        return EXIT_FAILURE;
        }
        return EXIT_SUCCESS;
 
   bad_group:
-       fatalError( "unknown group name: %s\n", groupName);
+       error_msg_and_die( "unknown group name: %s", groupName);
 }
 
 /*