Applied patch from Christophe Boyanique to add an egrep alias for grep.

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index 07b18713a9a2e2bb72d213c01c03b3831ea48015..902da7c9982e852d44643718da01fa7f8d76b112 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -21,15 +21,15 @@
  *
  */
 
+#include <stdio.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
 #include "busybox.h"
 #define bb_need_name_too_long
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 
-#include <stdio.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
 
 static int parentFlag = FALSE;
 static mode_t mode = 0777;
@@ -48,11 +48,11 @@ extern int mkdir_main(int argc, char **argv)
                        switch (**argv) {
                        case 'm':
                                if (--argc == 0)
-                                       usage(mkdir_usage);
+                                       show_usage();
                                /* Find the specified modes */
                                mode = 0;
                                if (parse_mode(*(++argv), &mode) == FALSE) {
-                                       error_msg_and_die("Unknown mode: %s\n", *argv);
+                                       error_msg_and_die("Unknown mode: %s", *argv);
                                }
                                /* Set the umask for this process so it doesn't 
                                 * screw up whatever the user just entered. */
@@ -63,7 +63,7 @@ extern int mkdir_main(int argc, char **argv)
                                parentFlag = TRUE;
                                break;
                        default:
-                               usage(mkdir_usage);
+                               show_usage();
                        }
                }
                argc--;
@@ -71,7 +71,7 @@ extern int mkdir_main(int argc, char **argv)
        }
 
        if (argc < 1) {
-               usage(mkdir_usage);
+               show_usage();
        }
 
        while (argc > 0) {
@@ -85,7 +85,7 @@ extern int mkdir_main(int argc, char **argv)
                strcpy(buf, *argv);
                status = stat(buf, &statBuf);
                if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
-                       error_msg_and_die("%s: File exists\n", buf);
+                       error_msg_and_die("%s: File exists", buf);
                }
                if (parentFlag == TRUE) {
                        strcat(buf, "/");