Changeset 769 in kBuild

Timestamp:

Jan 19, 2007 4:41:59 AM (18 years ago)

Author:

bird

Message:

Added variable lookup printing to delay expansion and such.

File:

• trunk/src/gmake/kmkbuiltin/append.c (modified) (6 diffs)

trunk/src/gmake/kmkbuiltin/append.c

@@ -29 +29 @@
 #include "err.h"
 #include "kmkbuiltin.h"
+#ifndef kmk_builtin_append
+# include "make.h"
+# include "variable.h"
+#endif
 
 
@@ -36 +40 @@
 static int usage(void)
 {
-    fprintf(stderr, "usage: append [-n] file [string ...]\n");
+    fprintf(stderr, "usage: append [-nv] file [string ...]\n");
     return 1;
 }
@@ -50 +54 @@
     FILE *pFile;
     int fNewLine = 0;
+#ifndef kmk_builtin_append
+    int fVariables = 0;
+#endif
 
     g_progname = argv[0];
@@ -60 +67 @@
        &&  argv[i][0] == '-'
        &&  argv[i][1] != '\0' /* '-' is a file */
-       &&  strchr("n", argv[i][1]) /* valid option char */
+       &&  strchr("nv", argv[i][1]) /* valid option char */
        )
     {
@@ -71 +78 @@
                     fNewLine = 1;
                     break;
+                case 'v':
+#ifndef kmk_builtin_append
+                    fVariables = 1;
+                    break;
+#else
+                    errx(1, "Option '-v' isn't supported in external mode.");
+                    return usage();
+#endif
                 default:
                     errx(1, "Invalid option '%c'! (%s)", *psz, argv[i]);
@@ -101 +116 @@
         if (!fFirst)
             fputc(fNewLine ? '\n' : ' ', pFile);
+#ifndef kmk_builtin_append
+        if (fVariables)
+        {
+            struct variable *pVar = lookup_variable(psz, cch);
+            if (!pVar)
+                continue;
+            if (    pVar->recursive
+                &&  memchr(pVar->value, '$', pVar->value_length))
+            {
+                char *pszExpanded = allocated_variable_expand(pVar->value);
+                fwrite(pszExpanded, 1, strlen(pszExpanded), pFile);
+                free(pszExpanded);
+            }
+            else
+                fwrite(pVar->value, 1, pVar->value_length, pFile);
+        }
         else
-            fFirst = 0;
-        fwrite(psz, 1, cch, pFile);
+#endif
+            fwrite(psz, 1, cch, pFile);
+        fFirst = 0;
     }