Changeset 611 in kBuild

Timestamp:

Nov 26, 2006 5:35:06 AM (18 years ago)

Author:

bird

Message:

Added cat as builtin command.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• src/gmake/Makefile.kmk (modified) (3 diffs)
• src/gmake/kmkbuiltin.c (modified) (1 diff)
• src/gmake/kmkbuiltin.h (modified) (1 diff)
• src/gmake/kmkbuiltin/cat.c (modified) (9 diffs)
• src/gmake/kmkbuiltin/mkdir.c (modified) (1 diff)
• src/gmake/variable.c (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
 2006-11-25:
     - kmk, kBuild:
+        o Added cat as builtin command.
+        o Added GNU sed version 4.1.5 and ported it to MSC.
         o Added rmdir as builtin and external command.
         o Made mkdir not modify the argument strings.

trunk/src/gmake/Makefile.kmk

@@ -97 +97 @@
         kmkbuiltin.c \
         kmkbuiltin/append.c \
+        kmkbuiltin/cat.c \
         kmkbuiltin/cp.c \
         kmkbuiltin/cp_utils.c \
@@ -124 +125 @@
 # Standalone kmkbuiltin commands.
 #
-PROGRAMS += kmk_append kmk_cp kmk_echo kmk_mkdir kmk_install kmk_ln kmk_rm kmk_rmdir
+PROGRAMS += kmk_append kmk_cat kmk_cp kmk_echo kmk_mkdir kmk_install kmk_ln kmk_rm kmk_rmdir
 
 kmk_append_TEMPLATE = BIN
@@ -132 +133 @@
         kmkbuiltin/append.c \
         kmkbuiltin/err.c
+
+kmk_cat_TEMPLATE = BIN
+kmk_cat_DEFS = kmk_builtin_cat=main
+kmk_cat_SOURCES = \
+        kmkbuiltin/cat.c \
+        kmkbuiltin/err.c
+ifeq ($(filter-out win32 win64 win nt,$(BUILD_TARGET)),)
+kmk_cat_INCS += $(PATH_TARGET) .
+kmk_cat_DEFS += HAVE_CONFIG_H
+kmk_cat_SOURCES += \
+        kmkbuiltin/mscfakes.c \
+        getopt.c \
+        getopt1.c
+endif
 
 kmk_cp_TEMPLATE = BIN

trunk/src/gmake/kmkbuiltin.c

@@ -198 +198 @@
     else if (!strcmp(pszCmd, "rmdir"))
         rc = kmk_builtin_rmdir(argc, argv, environ);
-    /* obsolete */
+    else if (!strcmp(pszCmd, "cat"))
+        rc = kmk_builtin_cat(argc, argv, environ);
     else if (!strcmp(pszCmd, "cp"))
         rc = kmk_builtin_cp(argc, argv, environ);

trunk/src/gmake/kmkbuiltin.h

@@ -30 +30 @@
 extern int kmk_builtin_append(int argc, char **argv, char **envp);
 extern int kmk_builtin_cp(int argc, char **argv, char **envp);
+extern int kmk_builtin_cat(int argc, char **argv, char **envp);
 extern int kmk_builtin_echo(int argc, char **argv, char **envp);
 extern int kmk_builtin_install(int argc, char **argv, char **envp);

trunk/src/gmake/kmkbuiltin/cat.c

@@ -44 +44 @@
 #endif
 #endif /* not lint */
+#if 0
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.32 2005/01/10 08:39:20 imp Exp $");
-
+#else
+#define NO_UDOM_SUPPORT /* kmk */
+#endif 
+
+#ifndef _MSC_VER
 #include <sys/param.h>
+#endif
 #include <sys/stat.h>
 #ifndef NO_UDOM_SUPPORT
@@ -56 +62 @@
 
 #include <ctype.h>
-#include <err.h>
+#include "err.h"
 #include <fcntl.h>
 #include <locale.h>
@@ -62 +68 @@
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#else
+#include "mscfakes.h"
+#endif 
 #include <stddef.h>
 
 int bflag, eflag, nflag, sflag, tflag, vflag;
-int rval;
+/*int rval;*/
 const char *filename;
 
-static void usage(void);
-static void scanfiles(char *argv[], int cooked);
-static void cook_cat(FILE *);
-static void raw_cat(int);
+static int usage(void);
+static int scanfiles(char *argv[], int cooked);
+static int cook_cat(FILE *);
+static int raw_cat(int);
 
 #ifndef NO_UDOM_SUPPORT
@@ -79 +89 @@
 
 int
-main(int argc, char *argv[])
-{
-        int ch;
-
+kmk_builtin_cat(int argc, char *argv[])
+{
+        int ch, rc;
+
+        /* kmk: reinitialize globals */
+        bflag = eflag = nflag = sflag = tflag = vflag = 0;
+        filename = NULL;
+
+        /* kmk: reset getopt and set progname */
+        g_progname = argv[0];
+        opterr = 1;
+        optarg = NULL;
+        optopt = 0;
+#if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
+        optreset = 1;
+        optind = 1;
+#else
+        optind = 0; /* init */
+#endif
+
+#ifdef kmk_builtin_cat /* kmk did this already. */
         setlocale(LC_CTYPE, "");
+#endif 
 
         while ((ch = getopt(argc, argv, "benstuv")) != -1)
@@ -109 +137 @@
                         break;
                 default:
-                        usage();
+                        return usage();
                 }
         argv += optind;
 
         if (bflag || eflag || nflag || sflag || tflag || vflag)
-                scanfiles(argv, 1);
+                rc = scanfiles(argv, 1);
         else
-                scanfiles(argv, 0);
+                rc = scanfiles(argv, 0);
+#ifdef kmk_builtin_cat /* only in the external program. */
         if (fclose(stdout))
-                err(1, "stdout");
-        exit(rval);
-        /* NOTREACHED */
-}
-
-static void
+                return err(1, "stdout");
+#endif
+        return rc;
+}
+
+static int
 usage(void)
 {
         fprintf(stderr, "usage: cat [-benstuv] [file ...]\n");
-        exit(1);
-        /* NOTREACHED */
-}
-
-static void
+        return 1;
+}
+
+static int
 scanfiles(char *argv[], int cooked)
 {
@@ -137 +165 @@
         char *path;
         FILE *fp;
+        int rc2 = 0;
+        int rc = 0;
 
         while ((path = argv[i]) != NULL || i == 0) {
@@ -154 +184 @@
                 if (fd < 0) {
                         warn("%s", path);
-                        rval = 1;
+                        rc2 = 1; /* non fatal */
                 } else if (cooked) {
                         if (fd == STDIN_FILENO)
-                                cook_cat(stdin);
+                                rc = cook_cat(stdin);
                         else {
                                 fp = fdopen(fd, "r");
-                                cook_cat(fp);
+                                rc = cook_cat(fp);
                                 fclose(fp);
                         }
                 } else {
-                        raw_cat(fd);
+                        rc = raw_cat(fd);
                         if (fd != STDIN_FILENO)
                                 close(fd);
                 }
-                if (path == NULL)
+                if (rc || path == NULL)
                         break;
                 ++i;
         }
-}
-
-static void
+        return !rc ? rc2 : rc;
+}
+
+static int
 cook_cat(FILE *fp)
 {
         int ch, gobble, line, prev;
+        int rc = 0;
 
         /* Reset EOF condition on stdin. */
@@ -228 +260 @@
         if (ferror(fp)) {
                 warn("%s", filename);
-                rval = 1;
+                rc = 1;
                 clearerr(fp);
         }
         if (ferror(stdout))
-                err(1, "stdout");
-}
-
-static void
+                return err(1, "stdout");
+        return rc;
+}
+
+static int
 raw_cat(int rfd)
 {
@@ -247 +280 @@
         if (buf == NULL) {
                 if (fstat(wfd, &sbuf))
-                        err(1, "%s", filename);
+                        return err(1, "%s", filename);
+#ifdef _MSC_VER
+                bsize = 1024;
+#else
                 bsize = MAX(sbuf.st_blksize, 1024);
+#endif 
                 if ((buf = malloc(bsize)) == NULL)
-                        err(1, "buffer");
+                        return err(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)
-                                err(1, "stdout");
+                                return err(1, "stdout");
         if (nr < 0) {
                 warn("%s", filename);
-                rval = 1;
-        }
+                return 1;
+        }
+        return 0;
 }
 

trunk/src/gmake/kmkbuiltin/mkdir.c

@@ -79 +79 @@
         mode = NULL;
 
-        /* reinitialize globals */
-        vflag = 0;
-
-        /* kmk: reset getopt and set progname */
-        g_progname = argv[0];
-        opterr = 1;
-        optarg = NULL;
-        optopt = 0;
+    /* reinitialize globals */
+    vflag = 0;
+    
+    /* kmk: reset getopt and set progname */
+    g_progname = argv[0];
+    opterr = 1;
+    optarg = NULL;
+    optopt = 0;
 #if defined(__FreeBSD__) || defined(__EMX__) || defined(__APPLE__)
-        optreset = 1;
-        optind = 1;
+    optreset = 1;
+    optind = 1;
 #else
-        optind = 0; /* init */
+    optind = 0; /* init */
 #endif
         while ((ch = getopt(argc, argv, "m:pv")) != -1)

trunk/src/gmake/variable.c

@@ -1062 +1062 @@
 #ifdef CONFIG_WITH_KMK_BUILTIN
   /* The supported kMk Builtin commands. */
-  (void) define_variable ("KMK_BUILTIN", 11, "append cp echo install ln mkdir rm rmdir", o_default, 0);
+  (void) define_variable ("KMK_BUILTIN", 11, "append cp cat echo install ln mkdir rm rmdir", o_default, 0);
 #endif