Changeset 1440 for trunk/src/kmk/kmkbuiltin/append.c

Timestamp:

Mar 30, 2008, 6:13:55 AM (17 years ago)

Author:

bird

Message:

Added comp-cmds-ex, commands, commands-sc and commands-usr. Added a '%' command prefix that make the commands functions skip the line. Added a -c flag to append that'll make it call commands on each argument (similar to -v). Fixed a little bug in comp-cmds/vars.

File:

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

trunk/src/kmk/kmkbuiltin/append.c

@@ -42 +42 @@
 {
     fprintf(pf,
-            "usage: %s [-nv] file [string ...]\n"
+            "usage: %s [-cnv] file [string ...]\n"
             "   or: %s --version\n"
             "   or: %s --help\n",
@@ -61 +61 @@
 #ifndef kmk_builtin_append
     int fVariables = 0;
+    int fCommands = 0;
 #endif
 
@@ -82 +83 @@
                 switch (*psz)
                 {
+                    case 'c':
+#ifndef kmk_builtin_append
+                        fCommands = 1;
+                        break;
+#else
+                        errx(1, "Option '-c' isn't supported in external mode.");
+                        return usage(stderr);
+#endif
                     case 'n':
                         fNewLine = 1;
@@ -134 +143 @@
             fputc(fNewLine ? '\n' : ' ', pFile);
 #ifndef kmk_builtin_append
-        if (fVariables)
+        if (fCommands)
+        {
+            char *pszOldBuf;
+            unsigned cchOldBuf;
+            char *pchEnd;
+
+            install_variable_buffer(&pszOldBuf, &cchOldBuf);
+
+            pchEnd = func_commands(variable_buffer, &argv[i], "commands");
+            fwrite(variable_buffer, 1, pchEnd - variable_buffer, pFile);
+
+            restore_variable_buffer(pszOldBuf, cchOldBuf);
+        }
+        else if (fVariables)
         {
             struct variable *pVar = lookup_variable(psz, cch);