Changeset 3192 for trunk/src/kmk/kmkbuiltin/cmp.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/cmp.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/cmp.c

@@ -64 +64 @@
 
 
-static int usage(FILE *);
+static int usage(PKMKBUILTINCTX pCtx, int is_err);
 
 int
-kmk_builtin_cmp(int argc, char *argv[], char **envp)
+kmk_builtin_cmp(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
     off_t skip1 = 0, skip2 = 0;
@@ -74 +74 @@
     char *file1, *file2;
 
-#ifdef kmk_builtin_cmp
+#ifdef KMK_BUILTIN_STANDALONE
     setlocale(LC_ALL, "");
 #endif
 
     /* reset getopt and set progname. */
-    g_progname = argv[0];
     opterr = 1;
     optarg = NULL;
@@ -96 +95 @@
                 break;
             case 261:
-                usage(stdout);
+                usage(pCtx, 0);
                 return 0;
             case 262:
@@ -102 +101 @@
             case '?':
             default:
-                return usage(stderr);
+                return usage(pCtx, 1);
         }
     }
@@ -109 +108 @@
 
     if (argc < 2 || argc > 4)
-        return usage(stderr);
+        return usage(pCtx, 1);
 
     file1 = argv[0];
@@ -121 +120 @@
         skip1 = strtoll(argv[2], &ep, 0);
         if (errno || ep == argv[2])
-            return errx(ERR_EXIT, "strtoll(%s,,) failed", argv[2]);
+            return errx(pCtx, ERR_EXIT, "strtoll(%s,,) failed", argv[2]);
 
         if (argc == 4)
@@ -127 +126 @@
             skip2 = strtoll(argv[3], &ep, 0);
             if (errno || ep == argv[3])
-                return errx(ERR_EXIT, "strtoll(%s,,) failed", argv[3]);
+                return errx(pCtx, ERR_EXIT, "strtoll(%s,,) failed", argv[3]);
         }
     }
 
-    return cmp_file_and_file_ex(file1, skip1, file2, skip2, sflag, lflag, 0);
+    return cmp_file_and_file_ex(pCtx, file1, skip1, file2, skip2, sflag, lflag, 0);
 }
 
 static int
-usage(FILE *fp)
+usage(PKMKBUILTINCTX pCtx, int is_err)
 {
-    fprintf(fp, "usage: %s [-l | -s] file1 file2 [skip1 [skip2]]\n"
-                "   or: %s --help\n"
-                "   or: %s --version\n",
-            g_progname, g_progname, g_progname);
+    kmk_builtin_ctx_printf(pCtx, is_err,
+                           "usage: %s [-l | -s] file1 file2 [skip1 [skip2]]\n"
+                           "   or: %s --help\n"
+                           "   or: %s --version\n",
+                           pCtx->pszProgName, pCtx->pszProgName, pCtx->pszProgName);
     return ERR_EXIT;
 }
+
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_cmp", NULL };
+    return kmk_builtin_cmp(argc, argv, envp, &Ctx);
+}
+#endif
+