Changeset 767 for trunk/src/gmake

Timestamp:

Jan 19, 2007, 3:27:11 AM (19 years ago)

Author:

bird

Message:

$(APPEND) -n file line1 line2 line3

Location:

trunk/src/gmake

Files:

• kmkbuiltin/append.c (modified) (2 diffs)
• variable.c (modified) (2 diffs)

trunk/src/gmake/kmkbuiltin/append.c

@@ -30 +30 @@
 #include "kmkbuiltin.h"
 
+
+/**
+ * Prints the usage and return 1.
+ */
+static int usage(void)
+{
+    fprintf(stderr, "usage: append [-n] file [string ...]\n");
+    return 1;
+}
+
+
 /**
  * Appends text to a textfile, creating the textfile if necessary.
@@ -36 +47 @@
 {
     int i;
+    int fFirst;
     FILE *pFile;
+    int fNewLine = 0;
 
     g_progname = argv[0];
 
     /*
+     * Parse options.
+     */
+    i = 1;
+    while (i < argc
+       &&  argv[i][0] == '-'
+       &&  argv[i][1] != '\0' /* '-' is a file */
+       &&  strchr("n", argv[i][1]) /* valid option char */
+       )
+    {
+        char *psz = &argv[i][1];
+        do
+        {
+            switch (*psz)
+            {
+                case 'n':
+                    fNewLine = 1;
+                    break;
+                default:
+                    errx(1, "Invalid option '%c'! (%s)", *psz, argv[i]);
+                    return usage();
+            }
+        } while (*++psz);
+        i++;
+    }
+
+    /*
      * Open the output file.
      */
-    if (argc <= 1)
+    if (i >= argc)
     {
         errx(1, "missing filename!");
-        fprintf(stderr, "usage: append file [string ...]\n");
-        return 1;
+        return usage();
     }
-    pFile = fopen(argv[1], "a");
+    pFile = fopen(argv[i], "a");
     if (!pFile)
-        return err(1, "failed to open '%s'.", argv[1]);
+        return err(1, "failed to open '%s'.", argv[i]);
 
     /*
      * Append the argument strings to the file
      */
-    for (i = 2; i < argc; i++)
+    fFirst = 1;
+    for (i++; i < argc; i++)
     {
         const char *psz = argv[i];
         size_t cch = strlen(psz);
-        if (i > 2)
-            fputc(' ', pFile);
+        if (!fFirst)
+            fputc(fNewLine ? '\n' : ' ', pFile);
+        else
+            fFirst = 0;
         fwrite(psz, 1, cch, pFile);
     }

trunk/src/gmake/variable.c

@@ -1042 +1042 @@
   && defined(KMK_HELPERS)
   (void) define_variable ("KMK_FEATURES", 12,
+                          "append-dash-n "
                           "abspath abspathex"
                           " toupper tolower"
@@ -1047 +1048 @@
                           " stack "
                           " math-int "
-                          " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one"
+                          " kb-src-tool kb-obj-base kb-obj-suff kb-src-prop kb-src-one "
                           , o_default, 0);
 # else /* MSC can't deal with strings mixed with #if/#endif, thus the slow way. */
-  strcpy(buf, "abspath");
+  strcpy(buf, "append-dash-n abspath");
 #  if defined(CONFIG_WITH_ABSPATHEX)
   strcat(buf, " abspathex");