386BSD 0.1 development

[unix-history] / usr / src / bin / mkdir / mkdir.c

diff --git a/usr/src/bin/mkdir/mkdir.c b/usr/src/bin/mkdir/mkdir.c
index 0ad1511..50843c4 100644 (file)
--- a/usr/src/bin/mkdir/mkdir.c
+++ b/usr/src/bin/mkdir/mkdir.c
@@ -2,17 +2,33 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #ifndef lint
  */
 
 #ifndef lint


@@ -22,26 +38,81 @@ 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.7 (Berkeley) 5/31/90";

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

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

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

+#include <string.h>
+
+extern int errno;

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

-       int err;
+       extern int 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);

 }
 }