Changeset 227 in kBuild for trunk/src/gmake/kmkbuiltin

Timestamp:

Feb 9, 2005 10:21:34 AM (20 years ago)

Author:

bird

Message:

builtin stuff.

Location:

trunk/src/gmake/kmkbuiltin

Files:

• echo.c (added)
• mkdir.c (modified) (8 diffs)
• setmode.c (added)

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -40 +40 @@
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
+//__FBSDID("$FreeBSD: src/bin/mkdir/mkdir.c,v 1.28 2004/04/06 20:06:48 markm Exp $");
 
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <err.h>
+//#include <err.h>
 #include <errno.h>
 #include <libgen.h>
@@ -54 +54 @@
 #include <unistd.h>
 
+extern void * setmode(const char *p);
+extern mode_t getmode(const void *bbox, mode_t omode);
+
 static int      build(char *, mode_t);
-static void     usage(void);
+static int      usage(void);
 
 int vflag;
 
 int
-main(int argc, char *argv[])
+kmk_builtin_mkdir(int argc, char *argv[])
 {
         int ch, exitval, success, pflag;
@@ -68 +71 @@
         omode = pflag = 0;
         mode = NULL;
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+        optind = 0; /* init */
         while ((ch = getopt(argc, argv, "m:pv")) != -1)
                 switch(ch) {
@@ -80 +87 @@
                         break;
                 case '?':
-                default:
-                        usage();
+                default:
+                        return usage();
                 }
 
@@ -87 +94 @@
         argv += optind;
         if (argv[0] == NULL)
-                usage();
+                return usage();
 
         if (mode == NULL) {
                 omode = S_IRWXU | S_IRWXG | S_IRWXO;
         } else {
-                if ((set = setmode(mode)) == NULL)
-                        errx(1, "invalid file mode: %s", mode);
+                if ((set = setmode(mode)) == NULL) {
+                        fprintf(stderr, "%s: invalid file mode: %s", mode, argv[0]);
+                        return 1;
+                }
                 omode = getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
                 free(set);
@@ -105 +114 @@
                 } else if (mkdir(*argv, omode) < 0) {
                         if (errno == ENOTDIR || errno == ENOENT)
-                                warn("%s", dirname(*argv));
+                                fprintf(stderr, "%s: %s", argv[0], dirname(*argv));
                         else
-                                warn("%s", *argv);
+                                fprintf(stderr, "%s: %s", argv[0], *argv);
                         success = 0;
                 } else if (vflag)
@@ -122 +131 @@
                  */
                 if (success && mode != NULL && chmod(*argv, omode) == -1) {
-                        warn("%s", *argv);
+                        fprintf(stderr, "%s: %s", argv[0], *argv);
                         exitval = 1;
                 }
         }
-        exit(exitval);
+        return exitval;
 }
 
@@ -200 +209 @@
 }
 
-void
+int
 usage(void)
 {
 
         (void)fprintf(stderr, "usage: mkdir [-pv] [-m mode] directory ...\n");
-        exit (EX_USAGE);
+        return EX_USAGE;
 }