Changeset 1695 in kBuild for trunk/src/kmk/kmkbuiltin

Timestamp:

Aug 31, 2008 8:24:55 PM (17 years ago)

Author:

bird

Message:

append: Added the -d and -t options for writing define...endef and truncating respectively.

File:

• trunk/src/kmk/kmkbuiltin/append.c (modified) (7 diffs)

trunk/src/kmk/kmkbuiltin/append.c

@@ -42 +42 @@
 {
     fprintf(pf,
-            "usage: %s [-cnv] file [string ...]\n"
+            "usage: %s [-dcntv] file [string ...]\n"
             "   or: %s --version\n"
-            "   or: %s --help\n",
+            "   or: %s --help\n"
+            "\n"
+            "Options:\n"
+            "  -d  Enclose the output in define ... endef, taking the name from\n"
+            "      the first argument following the file name.\n"
+            "  -c  Output the command for specified target(s). [builtin only]\n"
+            "  -n  Insert a new line between the strings.\n"
+            "  -t  Truncate the file instead of appending\n"
+            "  -v  Output the value(s) for specified variable(s). [builtin only]\n"
+            ,
             g_progname, g_progname, g_progname);
     return 1;
@@ -57 +66 @@
     int i;
     int fFirst;
+    int iFile;
     FILE *pFile;
     int fNewLine = 0;
-#ifndef kmk_builtin_append
+    int fTruncate = 0;
+    int fDefine = 0;
     int fVariables = 0;
     int fCommands = 0;
-#endif
 
     g_progname = argv[0];
@@ -73 +83 @@
        &&  argv[i][0] == '-'
        &&  argv[i][1] != '\0' /* '-' is a file */
-       &&  strchr("-cnv", argv[i][1]) /* valid option char */
+       &&  strchr("-cdntv", argv[i][1]) /* valid option char */
        )
     {
@@ -84 +94 @@
                 {
                     case 'c':
+                        if (fVariables)
+                        {
+                            errx(1, "Option '-c' clashes with '-v'.");
+                            return usage(stderr);
+                        }
 #ifndef kmk_builtin_append
                         fCommands = 1;
@@ -91 +106 @@
                         return usage(stderr);
 #endif
+                    case 'd':
+                        if (fVariables)
+                        {
+                            errx(1, "Option '-d' must come before '-v'!");
+                            return usage(stderr);
+                        }
+                        fDefine = 1;
+                        break;
                     case 'n':
                         fNewLine = 1;
                         break;
+                    case 't':
+                        fTruncate = 1;
+                        break;
                     case 'v':
+                        if (fCommands)
+                        {
+                            errx(1, "Option '-v' clashes with '-c'.");
+                            return usage(stderr);
+                        }
 #ifndef kmk_builtin_append
                         fVariables = 1;
@@ -120 +151 @@
     }
 
+    if (i + fDefine >= argc)
+    {
+        if (i <= argc)
+            errx(1, "missing filename!");
+        else
+            errx(1, "missing define name!");
+        return usage(stderr);
+    }
+
     /*
      * Open the output file.
      */
-    if (i >= argc)
-    {
-        errx(1, "missing filename!");
-        return usage(stderr);
-    }
-    pFile = fopen(argv[i], "a");
+    iFile = i;
+    pFile = fopen(argv[i], fTruncate ? "w" : "a");
     if (!pFile)
         return err(1, "failed to open '%s'.", argv[i]);
+
+    /*
+     * Start define?
+     */
+    if (fDefine)
+    {
+        i++;
+        fprintf(pFile, "define %s\n", argv[i]);
+    }
 
     /*
@@ -177 +222 @@
     }
 
-    /*
-     * Add the newline and close the file.
-     */
-    if (    fputc('\n', pFile) == EOF
+    /* 
+     * Add the newline, closing the define if needed, and close the file.
+     */
+    if (    (  fDefine
+             ? fwrite(fFirst ?        "endef\n"      :        "\nendef\n", 
+                      1, 
+                      fFirst ? sizeof("endef\n") - 1 : sizeof("\nendef\n") - 1, 
+                      pFile) < sizeof("endef\n")
+             : fputc('\n', pFile) == EOF)
         ||  ferror(pFile))
     {
         fclose(pFile);
-        return errx(1, "error writing to '%s'!", argv[1]);
+        return errx(1, "error writing to '%s'!", argv[iFile]);
     }
     if (fclose(pFile))
-        return err(1, "failed to fclose '%s'!", argv[1]);
+        return err(1, "failed to fclose '%s'!", argv[iFile]);
     return 0;
 }