forgot to remove some debugging noise

[oweals/busybox.git] / chmod_chown_chgrp.c

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index 178138a3ba120422a7d15ced1184c7f2a9e3972e..a458cf77a170d324048387f1dd33b2115b9d62d7 100644 (file)
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -22,16 +22,16 @@
  *
  */
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.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 <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 
 
 static long uid = -1;
@@ -65,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);
@@ -81,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 = (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;
-
        if (argc < 2)
-               usage(appUsage);
+               show_usage();
        argv++;
 
        /* Parse options */
@@ -150,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);
                        }
                }
        }
@@ -167,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);
 }
 
 /*