Changeset 2015 in kBuild

Timestamp:

Nov 1, 2008 10:16:55 PM (16 years ago)

Author:

bird

Message:

kmk_append: added a new option '-N' for suppressing the trailing new line. Fixes #53.

File:

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

trunk/src/kmk/kmkbuiltin/append.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
  * kMk Builtin command - append text to file.
- *
- * Copyright (c) 2005-2007 knut st. osmundsen <[email protected]>
- *
+ */
+
+/*
+ * Copyright (c) 2005-2008 knut st. osmundsen <[email protected]>
  *
  * This file is part of kBuild.
@@ -42 +42 @@
 {
     fprintf(pf,
-            "usage: %s [-dcntv] file [string ...]\n"
+            "usage: %s [-dcnNtv] file [string ...]\n"
             "   or: %s --version\n"
             "   or: %s --help\n"
@@ -51 +51 @@
             "  -c  Output the command for specified target(s). [builtin only]\n"
             "  -n  Insert a new line between the strings.\n"
+            "  -N  Suppress the trailing new line.\n"
             "  -t  Truncate the file instead of appending\n"
             "  -v  Output the value(s) for specified variable(s). [builtin only]\n"
@@ -69 +70 @@
     FILE *pFile;
     int fNewLine = 0;
+    int fNoTrailingNewLine = 0;
     int fTruncate = 0;
     int fDefine = 0;
@@ -83 +85 @@
        &&  argv[i][0] == '-'
        &&  argv[i][1] != '\0' /* '-' is a file */
-       &&  strchr("-cdntv", argv[i][1]) /* valid option char */
+       &&  strchr("-cdnNtv", argv[i][1]) /* valid option char */
        )
     {
@@ -116 +118 @@
                     case 'n':
                         fNewLine = 1;
+                        break;
+                    case 'N':
+                        fNoTrailingNewLine = 1;
                         break;
                     case 't':
@@ -222 +227 @@
     }
 
-    /* 
-     * 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)
+    /*
+     * End the define?
+     */
+    if (fDefine)
+    {
+        if (fFirst)
+            fwrite("\nendef", 1, sizeof("\nendef") - 1, pFile);
+        else
+            fwrite("endef", 1, sizeof("endef") - 1, pFile);
+    }
+
+    /*
+     * Add the final newline (unless supressed) and close the file.
+     */
+    if (    (   !fNoTrailingNewLine
+             && fputc('\n', pFile) == EOF)
         ||  ferror(pFile))
     {