Fix egrep

[oweals/busybox.git] / mkdir.c

diff --git a/mkdir.c b/mkdir.c
index b0a2d57d630526021043a63e5b78ad87602901c5..902da7c9982e852d44643718da01fa7f8d76b112 100644 (file)
--- a/mkdir.c
+++ b/mkdir.c
@@ -2,7 +2,7 @@
 /*
  * Mini mkdir 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
@@ -21,23 +21,15 @@
  *
  */
 
-#include "internal.h"
+#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 <sys/param.h>                 /* for PATH_MAX */
-
-static const char mkdir_usage[] =
-       "mkdir [OPTION] DIRECTORY...\n\n"
-       "Create the DIRECTORY(ies), if they do not already exist\n\n"
-       "Options:\n"
-
-       "\t-m\tset permission mode (as in chmod), not rwxrwxrwx - umask\n"
-       "\t-p\tno error if existing, make parent directories as needed\n";
-
 
 static int parentFlag = FALSE;
 static mode_t mode = 0777;
@@ -56,12 +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) {
-                                       fprintf(stderr, "Unknown mode: %s\n", *argv);
-                                       exit FALSE;
+                                       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. */
@@ -72,7 +63,7 @@ extern int mkdir_main(int argc, char **argv)
                                parentFlag = TRUE;
                                break;
                        default:
-                               usage(mkdir_usage);
+                               show_usage();
                        }
                }
                argc--;
@@ -80,35 +71,32 @@ extern int mkdir_main(int argc, char **argv)
        }
 
        if (argc < 1) {
-               usage(mkdir_usage);
+               show_usage();
        }
 
        while (argc > 0) {
                int status;
                struct stat statBuf;
-               char buf[PATH_MAX + 1];
+               char buf[BUFSIZ + 1];
 
-               if (strlen(*argv) > PATH_MAX - 1) {
-                       fprintf(stderr, name_too_long, "mkdir");
-                       exit FALSE;
+               if (strlen(*argv) > BUFSIZ - 1) {
+                       error_msg_and_die(name_too_long);
                }
                strcpy(buf, *argv);
                status = stat(buf, &statBuf);
                if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
-                       fprintf(stderr, "%s: File exists\n", buf);
-                       exit FALSE;
+                       error_msg_and_die("%s: File exists", buf);
                }
                if (parentFlag == TRUE) {
                        strcat(buf, "/");
-                       createPath(buf, mode);
+                       create_path(buf, mode);
                } else {
                        if (mkdir(buf, mode) != 0 && parentFlag == FALSE) {
-                               perror(buf);
-                               exit FALSE;
+                               perror_msg_and_die(buf);
                        }
                }
                argc--;
                argv++;
        }
-       exit TRUE;
+       return EXIT_SUCCESS;
 }