My latest ramblings.

[oweals/busybox.git] / coreutils / mkdir.c

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 9ea3b4ea0905d96e8e8c3721e6ee8f26631c68b8..70fdbdfb5660e62f413125df3e1b80663c7c5247 100644 (file)
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -1,3 +1,4 @@
+/* vi: set sw=4 ts=4: */
 /*
  * Mini mkdir implementation for busybox
  *
@@ -22,15 +23,21 @@
  */
 
 #include "internal.h"
+#define bb_need_name_too_long
+#define BB_DECLARE_EXTERN
+#include "messages.c"
+
 #include <stdio.h>
 #include <errno.h>
-#include <sys/param.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"
 
-static const char mkdir_usage[] = "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";
+       "\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;
@@ -39,69 +46,70 @@ static mode_t mode = 0777;
 
 extern int mkdir_main(int argc, char **argv)
 {
-    int i=FALSE;
-    argc--;
-    argv++;
+       int i = FALSE;
 
-    /* Parse any options */
-    while (argc > 0 && **argv == '-') {
-       while (i==FALSE && *++(*argv)) {
-           switch (**argv) {
-           case 'm':
-               if (--argc == 0)
-                   usage( mkdir_usage);
-               /* Find the specified modes */
-               mode = 0;
-               if ( parse_mode(*(++argv), &mode) == FALSE ) {
-                   fprintf(stderr, "Unknown mode: %s\n", *argv);
-                   exit( FALSE);
-               }
-               /* Set the umask for this process so it doesn't 
-                * screw up whatever the user just entered. */
-               umask(0);
-               i=TRUE;
-               break;
-           case 'p':
-               parentFlag = TRUE;
-               break;
-           default:
-               usage( mkdir_usage);
-           }
-       }
        argc--;
        argv++;
-    }
 
+       /* Parse any options */
+       while (argc > 0 && **argv == '-') {
+               while (i == FALSE && *++(*argv)) {
+                       switch (**argv) {
+                       case 'm':
+                               if (--argc == 0)
+                                       usage(mkdir_usage);
+                               /* Find the specified modes */
+                               mode = 0;
+                               if (parse_mode(*(++argv), &mode) == FALSE) {
+                                       fprintf(stderr, "Unknown mode: %s\n", *argv);
+                                       exit FALSE;
+                               }
+                               /* Set the umask for this process so it doesn't 
+                                * screw up whatever the user just entered. */
+                               umask(0);
+                               i = TRUE;
+                               break;
+                       case 'p':
+                               parentFlag = TRUE;
+                               break;
+                       default:
+                               usage(mkdir_usage);
+                       }
+               }
+               argc--;
+               argv++;
+       }
 
-    if (argc < 1) {
-       usage( mkdir_usage);
-    }
+       if (argc < 1) {
+               usage(mkdir_usage);
+       }
 
-    while (argc > 0) {
-       int status;
-       struct stat statBuf;
-       char buf[NAME_MAX];
+       while (argc > 0) {
+               int status;
+               struct stat statBuf;
+               char buf[PATH_MAX + 1];
 
-       strcpy (buf, *argv);
-       status=stat(buf, &statBuf);
-       if (status != -1 && status != ENOENT ) {
-           fprintf(stderr, "%s: File exists\n", buf);
-           exit( FALSE);
-       }
-       if (parentFlag == TRUE) {
-           strcat( buf, "/");
-           createPath(buf, mode);
-       }
-       else { 
-           if (mkdir (buf, mode) != 0) {
-               perror(buf);
-               exit( FALSE);
-           }
+               if (strlen(*argv) > PATH_MAX - 1) {
+                       fprintf(stderr, name_too_long, "mkdir");
+                       exit FALSE;
+               }
+               strcpy(buf, *argv);
+               status = stat(buf, &statBuf);
+               if (parentFlag == FALSE && status != -1 && errno != ENOENT) {
+                       fprintf(stderr, "%s: File exists\n", buf);
+                       exit FALSE;
+               }
+               if (parentFlag == TRUE) {
+                       strcat(buf, "/");
+                       createPath(buf, mode);
+               } else {
+                       if (mkdir(buf, mode) != 0 && parentFlag == FALSE) {
+                               perror(buf);
+                               exit FALSE;
+                       }
+               }
+               argc--;
+               argv++;
        }
-       argc--;
-       argv++;
-    }
-    exit( TRUE);
+       exit TRUE;
 }
-
-