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

trunk/src/kmk/kmkbuiltin/cat.c

@@ -93 +93 @@
 
 
-static int usage(FILE *);
-static int scanfiles(char *argv[], int cooked);
-static int cook_cat(FILE *);
-static int raw_cat(int);
+static int usage(PKMKBUILTINCTX pCtx, int fIsErr);
+static int scanfiles(PKMKBUILTINCTX pCtx, char *argv[], int cooked);
+static int cook_cat(PKMKBUILTINCTX pCtx, FILE *);
+static int raw_cat(PKMKBUILTINCTX pCtx, int);
 
 #ifndef NO_UDOM_SUPPORT
-static int udom_open(const char *path, int flags);
+static int udom_open(PKMKBUILTINCTX pCtx, const char *path, int flags);
 #endif
 
 int
-kmk_builtin_cat(int argc, char *argv[], char **envp)
+kmk_builtin_cat(int argc, char **argv, char **envp, PKMKBUILTINCTX pCtx)
 {
         int ch, rc;
@@ -112 +112 @@
 
         /* kmk: reset getopt and set progname */
-        g_progname = argv[0];
         opterr = 1;
         optarg = NULL;
@@ -118 +117 @@
         optind = 0; /* init */
 
-#ifdef kmk_builtin_cat /* kmk did this already. */
+#ifdef KMK_BUILTIN_STANDALONE /* kmk did this already. */
         setlocale(LC_CTYPE, "");
-#else
-        fflush(stdout);
 #endif
 
@@ -142 +139 @@
                         break;
                 case 'u':
+#ifdef KMK_BUILTIN_STANDALONE /* don't allow messing with stdout */
                         setbuf(stdout, NULL);
+#endif
                         break;
                 case 'v':
@@ -148 +147 @@
                         break;
                 case 261:
-                        usage(stdout);
+                        usage(pCtx, 0);
                         return 0;
                 case 262:
                         return kbuild_version(argv[0]);
                 default:
-                        return usage(stderr);
+                        return usage(pCtx, 1);
                 }
         argv += optind;
 
         if (bflag || eflag || nflag || sflag || tflag || vflag)
-                rc = scanfiles(argv, 1);
+                rc = scanfiles(pCtx, argv, 1);
         else
-                rc = scanfiles(argv, 0);
-#ifdef kmk_builtin_cat /* only in the external program. */
+                rc = scanfiles(pCtx, argv, 0);
+#ifdef KMK_BUILTIN_STANDALONE /* don't allow messing with stdout */
         if (fclose(stdout))
-                return err(1, "stdout");
+                return err(pCtx, 1, "stdout");
 #endif
         return rc;
 }
 
-static int
-usage(FILE *fp)
-{
-        fprintf(fp, "usage: %s [-benstuv] [file ...]\n"
-                    "   or: %s --help\n"
-                    "   or: %s --version\n",
-                g_progname, g_progname, g_progname);
+#ifdef KMK_BUILTIN_STANDALONE
+int main(int argc, char **argv, char **envp)
+{
+    KMKBUILTINCTX Ctx = { "kmk_cat", NULL };
+    return kmk_builtin_cat(argc, argv, envp, &Ctx);
+}
+#endif
+
+static int
+usage(PKMKBUILTINCTX pCtx, int fIsErr)
+{
+        kmk_builtin_ctx_printf(pCtx, fIsErr,
+                               "usage: %s [-benstuv] [file ...]\n"
+                               "   or: %s --help\n"
+                               "   or: %s --version\n",
+                               pCtx->pszProgName, pCtx->pszProgName,
+                               pCtx->pszProgName);
         return 1;
 }
 
 static int
-scanfiles(char *argv[], int cooked)
+scanfiles(PKMKBUILTINCTX pCtx, char *argv[], int cooked)
 {
         int i = 0;
@@ -198 +207 @@
 #ifndef NO_UDOM_SUPPORT
                         if (fd < 0 && errno == EOPNOTSUPP)
-                                fd = udom_open(path, O_RDONLY);
+                                fd = udom_open(pCtx, path, O_RDONLY);
 #endif
                 }
                 if (fd < 0) {
-                        warn("%s", path);
+                        warn(pCtx, "%s", path);
                         rc2 = 1; /* non fatal */
                 } else if (cooked) {
                         if (fd == STDIN_FILENO)
-                                rc = cook_cat(stdin);
+                                rc = cook_cat(pCtx, stdin);
                         else {
                                 fp = fdopen(fd, "r");
-                                rc = cook_cat(fp);
+                                rc = cook_cat(pCtx, fp);
                                 fclose(fp);
                         }
                 } else {
-                        rc = raw_cat(fd);
+                        rc = raw_cat(pCtx, fd);
                         if (fd != STDIN_FILENO)
                                 close(fd);
@@ -224 +233 @@
 }
 
-static int
-cook_cat(FILE *fp)
+static int cat_putchar(PKMKBUILTINCTX pCtx, char ch)
+{
+#ifndef KMK_BUILTIN_STANDALONE
+        if (pCtx->pOut) {
+                output_write_text(pCtx->pOut, 0, &ch, 1);
+                return 0;
+        }
+#endif
+        return putchar(ch);
+}
+
+static int
+cook_cat(PKMKBUILTINCTX pCtx, FILE *fp)
 {
         int ch, gobble, line, prev;
@@ -246 +266 @@
                         }
                         if (nflag && (!bflag || ch != '\n')) {
-                                (void)fprintf(stdout, "%6d\t", ++line);
+                                kmk_builtin_ctx_printf(pCtx, 0, "%6d\t", ++line);
                                 if (ferror(stdout))
                                         break;
@@ -252 +272 @@
                 }
                 if (ch == '\n') {
-                        if (eflag && putchar('$') == EOF)
+                        if (eflag && cat_putchar(pCtx, '$') == EOF)
                                 break;
                 } else if (ch == '\t') {
                         if (tflag) {
-                                if (putchar('^') == EOF || putchar('I') == EOF)
+                                if (cat_putchar(pCtx, '^') == EOF || cat_putchar(pCtx, 'I') == EOF)
                                         break;
                                 continue;
@@ -262 +282 @@
                 } else if (vflag) {
                         if (!isascii(ch) && !isprint(ch)) {
-                                if (putchar('M') == EOF || putchar('-') == EOF)
+                                if (cat_putchar(pCtx, 'M') == EOF || cat_putchar(pCtx, '-') == EOF)
                                         break;
                                 ch = toascii(ch);
                         }
                         if (iscntrl(ch)) {
-                                if (putchar('^') == EOF ||
-                                    putchar(ch == '\177' ? '?' :
+                                if (cat_putchar(pCtx, '^') == EOF ||
+                                    cat_putchar(pCtx, ch == '\177' ? '?' :
                                     ch | 0100) == EOF)
                                         break;
@@ -274 +294 @@
                         }
                 }
-                if (putchar(ch) == EOF)
+                if (cat_putchar(pCtx, ch) == EOF)
                         break;
         }
         if (ferror(fp)) {
-                warn("%s", filename);
+                warn(pCtx, "%s", filename);
                 rc = 1;
                 clearerr(fp);
         }
         if (ferror(stdout))
-                return err(1, "stdout");
+                return err(pCtx, 1, "stdout");
         return rc;
 }
 
 static int
-raw_cat(int rfd)
+raw_cat(PKMKBUILTINCTX pCtx, int rfd)
 {
         int off, wfd = fileno(stdout);
@@ -299 +319 @@
         if (buf == NULL) {
                 if (fstat(wfd, &sbuf))
-                        return err(1, "%s", filename);
+                        return err(pCtx, 1, "%s", filename);
 #ifdef KBUILD_OS_WINDOWS
                 bsize = 16384;
@@ -306 +326 @@
 #endif
                 if ((buf = malloc(bsize)) == NULL)
-                        return err(1, "buffer");
+                        return err(pCtx, 1, "buffer");
         }
         while ((nr = read(rfd, buf, bsize)) > 0)
-                for (off = 0; nr; nr -= nw, off += nw)
-                        if ((nw = write(wfd, buf + off, (size_t)nr)) < 0)
-                                return err(1, "stdout");
+                for (off = 0; nr; nr -= nw, off += nw) {
+#ifndef KMK_BUILTIN_STANDALONE
+                        if (pCtx->pOut)
+                                nw = output_write_text(pCtx->pOut, 0, buf, nr);
+                        else
+#endif
+                                nw = write(wfd, buf + off, (size_t)nr);
+                        if (nw < 0)
+                                return err(pCtx, 1, "stdout");
+                }
         if (nr < 0) {
-                warn("%s", filename);
+                warn(pCtx, "%s", filename);
                 return 1;
         }
@@ -322 +349 @@
 
 static int
-udom_open(const char *path, int flags)
+udom_open(PKMKBUILTINCTX pCtx, const char *path, int flags)
 {
         struct sockaddr_un sou;
@@ -356 +383 @@
                 case O_RDONLY:
                         if (shutdown(fd, SHUT_WR) == -1)
-                                warn(NULL);
+                                warn(pCtx, NULL);
                         break;
                 case O_WRONLY:
                         if (shutdown(fd, SHUT_RD) == -1)
-                                warn(NULL);
+                                warn(pCtx, NULL);
                         break;
                 default:
@@ -370 +397 @@
 
 #endif
+