add -p flag; POSIX 1003.2 compliant

SCCS-vsn: bin/mkdir/mkdir.c 5.4

diff --git a/usr/src/bin/mkdir/mkdir.c b/usr/src/bin/mkdir/mkdir.c
index 0ad1511..63fc2ea 100644 (file)
--- a/usr/src/bin/mkdir/mkdir.c
+++ b/usr/src/bin/mkdir/mkdir.c
@@ -22,26 +22,79 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)mkdir.c    5.3 (Berkeley) %G%";
+static char sccsid[] = "@(#)mkdir.c    5.4 (Berkeley) %G%";

 #endif /* not lint */
 
 #endif /* not lint */
 

+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <strings.h>

 
 main(argc, argv)
        int argc;
        char **argv;
 {
 
 main(argc, argv)
        int argc;
        char **argv;
 {

-       int err;
+       extern int errno, optind;
+       int ch, exitval, pflag;

 
 

-       if (argc < 2) {
-               fputs("usage: mkdir directory ...\n", stderr);
-               exit(1);
-       }
-       for (err = 0; *++argv;)
-               if (mkdir(*argv, 0777) < 0) {
-                       fputs("mkdir: ", stderr);
-                       perror(*argv);
-                       ++err;
+       pflag = 0;
+       while ((ch = getopt(argc, argv, "p")) != EOF)
+               switch(ch) {
+               case 'p':
+                       pflag = 1;
+                       break;
+               case '?':
+               default:
+                       usage();
+               }
+
+       if (!*(argv += optind))
+               usage();
+
+       for (exitval = 0; *argv; ++argv)
+               if (pflag)
+                       exitval |= build(*argv);
+               else if (mkdir(*argv, 0777) < 0) {
+                       (void)fprintf(stderr, "mkdir: %s: %s\n",
+                           *argv, strerror(errno));
+                       exitval = 1;

                }
                }

-       exit(err ? 1 : 0);
+       exit(exitval);
+}
+
+build(path)
+       char *path;
+{
+       register char *p;
+       struct stat sb;
+       int create, ch;
+
+       for (create = 0, p = path;; ++p)
+               if (!*p || *p  == '/') {
+                       ch = *p;
+                       *p = '\0';
+                       if (stat(path, &sb)) {
+                               if (errno != ENOENT || mkdir(path, 0777) < 0) {
+                                       (void)fprintf(stderr, "mkdir: %s: %s\n",
+                                           path, strerror(errno));
+                                       return(1);
+                               }
+                               create = 1;
+                       }
+                       if (!(*p = ch))
+                               break;
+               }
+       if (!create) {
+               (void)fprintf(stderr, "mkdir: %s: %s\n", path,
+                   strerror(EEXIST));
+               return(1);
+       }
+       return(0);
+}
+
+usage()
+{
+       (void)fprintf(stderr, "usage: mkdir [-p] dirname ...\n");
+       exit(1);

 }
 }