Changeset 3192 in kBuild for trunk/src/kmk/kmkbuiltin/chmod.c

Timestamp:

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

Author:

bird

Message:

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

File:

• trunk/src/kmk/kmkbuiltin/chmod.c (modified) (12 diffs)

trunk/src/kmk/kmkbuiltin/chmod.c

@@ -75 +75 @@
 #endif
 
-static int usage(FILE *);
+static int usage(PKMKBUILTINCTX pCtx, int is_err);
 
 static struct option long_options[] =
@@ -86 +86 @@
 
 int
-kmk_builtin_chmod(int argc, char *argv[], char **envp)
+kmk_builtin_chmod(int argc, char *argv[], char **envp, PKMKBUILTINCTX pCtx)
 {
         FTS *ftsp;
@@ -98 +98 @@
 
         /* kmk: reset getopt and set progname */
-        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -153 +152 @@
                         break;
                 case 261:
-                        usage(stdout);
+                        usage(pCtx, 0);
                         return 0;
                 case 262:
@@ -159 +158 @@
                 case '?':
                 default:
-                        return usage(stderr);
+                        return usage(pCtx, 1);
                 }
 done:   argv += optind;
@@ -165 +164 @@
 
         if (argc < 2)
-                return usage(stderr);
+                return usage(pCtx, 1);
 
         if (Rflag) {
                 fts_options = FTS_PHYSICAL;
                 if (hflag)
-                        return errx(1,
+                        return errx(pCtx, 1,
                 "the -R and -h options may not be specified together.");
                 if (Hflag)
@@ -188 +187 @@
         mode = *argv;
         if ((set = bsd_setmode(mode)) == NULL)
-                return errx(1, "invalid file mode: %s", mode);
+                return errx(pCtx, 1, "invalid file mode: %s", mode);
 
         if ((ftsp = fts_open(++argv, fts_options, 0)) == NULL)
-                return err(1, "fts_open");
+                return err(pCtx, 1, "fts_open");
         for (rval = 0; (p = fts_read(ftsp)) != NULL;) {
                 switch (p->fts_info) {
@@ -199 +198 @@
                         continue;
                 case FTS_DNR:                   /* Warn, chmod, continue. */
-                        warnx("fts: %s: %s", p->fts_path, strerror(p->fts_errno));
+                        warnx(pCtx, "fts: %s: %s", p->fts_path, strerror(p->fts_errno));
                         rval = 1;
                         break;
                 case FTS_ERR:                   /* Warn, continue. */
                 case FTS_NS:
-                        warnx("fts: %s: %s", p->fts_path, strerror(p->fts_errno));
+                        warnx(pCtx, "fts: %s: %s", p->fts_path, strerror(p->fts_errno));
                         rval = 1;
                         continue;
@@ -225 +224 @@
                         continue;
                 if ((*change_mode)(p->fts_accpath, newmode) && !fflag) {
-                        warn("%schmod: %s", hflag ? "l" : "", p->fts_path);
+                        warn(pCtx, "%schmod: %s", hflag ? "l" : "", p->fts_path);
                         rval = 1;
                 } else {
                         if (vflag) {
-                                (void)printf("%s", p->fts_path);
+                                kmk_builtin_ctx_printf(pCtx, 0, "%s", p->fts_path);
 
                                 if (vflag > 1) {
@@ -238 +237 @@
                                             S_IFMT) | newmode, m2);
 
-                                        (void)printf(": 0%o [%s] -> 0%o [%s]",
+                                        kmk_builtin_ctx_printf(pCtx, 0, ": 0%o [%s] -> 0%o [%s]",
                                             (unsigned int)p->fts_statp->st_mode, m1,
                                             (unsigned int)((p->fts_statp->st_mode & S_IFMT) | newmode), m2);
                                 }
-                                (void)printf("\n");
+                                kmk_builtin_ctx_printf(pCtx, 0, "\n");
                         }
 
@@ -248 +247 @@
         }
         if (errno)
-                rval = err(1, "fts_read");
+                rval = err(pCtx, 1, "fts_read");
         free(set);
         fts_close(ftsp);
@@ -255 +254 @@
 
 int
-usage(FILE *out)
-{
-        (void)fprintf(out,
+usage(PKMKBUILTINCTX pCtx, int is_err)
+{
+        kmk_builtin_ctx_printf(pCtx, is_err,
             "usage: %s [-fhv] [-R [-H | -L | -P]] mode file ...\n"
             "   or: %s --version\n"
             "   or: %s --help\n",
-            g_progname, g_progname, g_progname);
+            pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName);
 
         return 1;
 }
+
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_chmod", NULL };
+    return kmk_builtin_chmod(argc, argv, envp, &Ctx);
+}
+#endif
+