Changeset 3192 for trunk/src/kmk/kmkbuiltin/mkdir.c

Timestamp:

Mar 26, 2018, 10:25:56 PM (7 years ago)

Author:

bird

Message:

kmkbuiltin: funnel output thru output.c (usually via err.c).

File:

• trunk/src/kmk/kmkbuiltin/mkdir.c (modified) (11 diffs)

trunk/src/kmk/kmkbuiltin/mkdir.c

@@ -72 +72 @@
 
 
-static int vflag;
 static struct option long_options[] =
 {
@@ -84 +83 @@
 extern mode_t bsd_getmode(const void *bbox, mode_t omode);
 
-static int      build(char *, mode_t);
-static int      usage(FILE *);
+static int      build(PKMKBUILTINCTX pCtx, char *, mode_t, int);
+static int      usage(PKMKBUILTINCTX pCtx, int fIsErr);
 
 
 int
-kmk_builtin_mkdir(int argc, char *argv[], char **envp)
-{
-        int ch, exitval, success, pflag;
+kmk_builtin_mkdir(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
+{
+        int ch, exitval, success, pflag, vflag;
         mode_t omode, *set = (mode_t *)NULL;
         char *mode;
 
-        omode = pflag = 0;
+        omode = pflag = vflag = 0;
         mode = NULL;
 
-        /* reinitialize globals */
-        vflag = 0;
-
         /* kmk: reset getopt and set progname */
-        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -119 +114 @@
                         break;
                 case 261:
-                        usage(stdout);
+                        usage(pCtx, 0);
                         return 0;
                 case 262:
                         return kbuild_version(argv[0]);
                 case '?':
-                        default:
-                        return usage(stderr);
+                default:
+                        return usage(pCtx, 1);
                 }
 
@@ -131 +126 @@
         argv += optind;
         if (argv[0] == NULL)
-                return usage(stderr);
+                return usage(pCtx, 1);
 
         if (mode == NULL) {
@@ -137 +132 @@
         } else {
                 if ((set = bsd_setmode(mode)) == NULL)
-                        return errx(1, "invalid file mode: %s", mode);
+                        return errx(pCtx, 1, "invalid file mode: %s", mode);
                 omode = bsd_getmode(set, S_IRWXU | S_IRWXG | S_IRWXO);
                 free(set);
@@ -145 +140 @@
                 success = 1;
                 if (pflag) {
-                        if (build(*argv, omode))
+                        if (build(pCtx, *argv, omode, vflag))
                                 success = 0;
                 } else if (mkdir(*argv, omode) < 0) {
                         if (errno == ENOTDIR || errno == ENOENT)
-                                warn("mkdir: %s", dirname(*argv));
+                                warn(pCtx, "mkdir: %s", dirname(*argv));
                         else
-                                warn("mkdir: %s", *argv);
+                                warn(pCtx, "mkdir: %s", *argv);
                         success = 0;
                 } else if (vflag)
-                        (void)printf("%s\n", *argv);
+                        kmk_builtin_ctx_printf(pCtx, 0, "%s\n", *argv);
 
                 if (!success)
@@ -166 +161 @@
                  */
                 if (success && mode != NULL && chmod(*argv, omode) == -1) {
-                        warn("chmod: %s", *argv);
+                        warn(pCtx, "chmod: %s", *argv);
                         exitval = 1;
                 }
@@ -173 +168 @@
 }
 
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_mkdir", NULL };
+    return kmk_builtin_mkdir(argc, argv, envp, &Ctx);
+}
+#endif
+
 static int
-build(char *path, mode_t omode)
+build(PKMKBUILTINCTX pCtx, char *path, mode_t omode, int vflag)
 {
         struct stat sb;
@@ -251 +254 @@
                             || errno == EACCES /* (ditto) */) {
                                 if (stat(path, &sb) < 0) {
-                                        warn("stat: %s", path);
+                                        warn(pCtx, "stat: %s", path);
                                         retval = 1;
                                         break;
@@ -259 +262 @@
                                         else
                                                 errno = ENOTDIR;
-                                        warn("st_mode: %s", path);
+                                        warn(pCtx, "st_mode: %s", path);
                                         retval = 1;
                                         break;
                                 }
                         } else {
-                                warn("mkdir: %s", path);
+                                warn(pCtx, "mkdir: %s", path);
                                 retval = 1;
                                 break;
                         }
                 } else if (vflag)
-                        printf("%s\n", path);
+                        kmk_builtin_ctx_printf(pCtx, 0, "%s\n", path);
                 if (!last)
                     *p = '/';
@@ -279 +282 @@
 
 static int
-usage(FILE *pf)
-{
-        fprintf(pf, "usage: %s [-pv] [-m mode] directory ...\n"
-                    "   or: %s --help\n"
-                    "   or: %s --version\n",
-                g_progname, g_progname, g_progname);
+usage(PKMKBUILTINCTX pCtx, int fIsErr)
+{
+        kmk_builtin_ctx_printf(pCtx, fIsErr,
+                               "usage: %s [-pv] [-m mode] directory ...\n"
+                               "   or: %s --help\n"
+                               "   or: %s --version\n",
+                               pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName);
         return EX_USAGE;
 }
+