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 45e0627..50843c4 100644 (file)
--- a/usr/src/bin/mkdir/mkdir.c
+++ b/usr/src/bin/mkdir/mkdir.c
@@ -1,77 +1,118 @@
-static char *sccsid = "@(#)mkdir.c     4.2 (Berkeley) %G%";

 /*
 /*

-** make directory
-*/
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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.
+ */

 
 

-#include       <signal.h>
-#include       <stdio.h>
-#include       <sys/types.h>
-#include       <stat.h>
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1983 Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */

 
 

-int    Errors = 0;
-char   *strcat();
-char   *strcpy();
+#ifndef lint
+static char sccsid[] = "@(#)mkdir.c    5.7 (Berkeley) 5/31/90";
+#endif /* not lint */
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+
+extern int errno;

 
 main(argc, argv)
 
 main(argc, argv)

-char *argv[];
+       int argc;
+       char **argv;

 {
 {

+       extern int optind;
+       int ch, exitval, pflag;

 
 

-       signal(SIGHUP, SIG_IGN);
-       signal(SIGINT, SIG_IGN);
-       signal(SIGQUIT, SIG_IGN);
-       signal(SIGPIPE, SIG_IGN);
-       signal(SIGTERM, SIG_IGN);
+       pflag = 0;
+       while ((ch = getopt(argc, argv, "p")) != EOF)
+               switch(ch) {
+               case 'p':
+                       pflag = 1;
+                       break;
+               case '?':
+               default:
+                       usage();
+               }

 
 

-       if(argc < 2) {
-               fprintf(stderr, "mkdir: arg count\n");
-               exit(1);
-       }
-       while(--argc)
-               mkdir(*++argv);
-       exit(Errors!=0);
+       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(exitval);

 }
 
 }
 

-mkdir(d)
-char *d;
+build(path)
+       char *path;

 {
 {

-       char pname[128], dname[128];
-       struct stat statblk;
-       register i, slash = 0;
+       register char *p;
+       struct stat sb;
+       int create, ch;

 
 

-       pname[0] = '\0';
-       for(i = 0; d[i]; ++i)
-               if(d[i] == '/')
-                       slash = i + 1;
-       if(slash)
-               strncpy(pname, d, slash);
-       strcpy(pname+slash, ".");
-       if (access(pname, 02)) {
-               fprintf(stderr,"mkdir: cannot access %s\n", pname);
-               ++Errors;
-               return;
-       }
-       if ((mknod(d, 040777, 0)) < 0) {
-               fprintf(stderr,"mkdir: cannot make directory %s\n", d);
-               ++Errors;
-               return;
-       }
-       (void) stat(d,&statblk);
-       
-       chown(d, getuid(), (int) statblk.st_gid);
-       strcpy(dname, d);
-       strcat(dname, "/.");
-       if((link(d, dname)) < 0) {
-               fprintf(stderr, "mkdir: cannot link %s\n", dname);
-               unlink(d);
-               ++Errors;
-               return;
-       }
-       strcat(dname, ".");
-       if((link(pname, dname)) < 0) {
-               fprintf(stderr, "mkdir: cannot link %s\n",dname);
-               dname[strlen(dname)] = '\0';
-               unlink(dname);
-               unlink(d);
-               ++Errors;
+       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);

 }
 }