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 530c45658b5a2c26680a1799ddc6cf202a7f5a9e..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
@@ -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) {
-                       error_msg_and_die( "unknown mode: %s\n", theMode);
+                       error_msg_and_die( "unknown mode: %s", theMode);
                }
                if (chmod(fileName, statbuf->st_mode) == 0)
                        return (TRUE);
@@ -80,17 +81,13 @@ int chmod_chown_chgrp_main(int argc, char **argv)
        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 */
@@ -149,7 +146,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
                        if (*argv == p)
                                uid = my_getpwnam(*argv);
                        if (uid == -1) {
-                               error_msg_and_die( "unknown user name: %s\n", *argv);
+                               error_msg_and_die( "unknown user name: %s", *argv);
                        }
                }
        }
@@ -166,7 +163,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
        return EXIT_SUCCESS;
 
   bad_group:
-       error_msg_and_die( "unknown group name: %s\n", groupName);
+       error_msg_and_die( "unknown group name: %s", groupName);
 }
 
 /*