Changeset 1442 in kBuild

Timestamp:

Mar 30, 2008 6:45:10 AM (17 years ago)

Author:

bird

Message:

fixes.

Location:

trunk/src/kmk

Files:

• function.c (modified) (1 diff)
• kmkbuiltin/append.c (modified) (1 diff)

trunk/src/kmk/function.c

@@ -3775 +3775 @@
           o = variable_expand_for_file_2 (o, cmds->command_lines[i], file);
 
-          /* blank, if so, drop it. */
+          /* Skip it if it has a '%' prefix or is blank. */
           p = o;
-          while (isblank ((unsigned char)*o))
+          while (isblank ((unsigned char)*o) 
+              || strchr("@-+", *o))
             o++;
-          if (o != '\0')
+          if (*o != '\0' && *o != '%')
             o = strchr (o, '\0');
           else

trunk/src/kmk/kmkbuiltin/append.c

@@ -73 +73 @@
        &&  argv[i][0] == '-'
        &&  argv[i][1] != '\0' /* '-' is a file */
-       &&  strchr("-nv", argv[i][1]) /* valid option char */
+       &&  strchr("-cnv", argv[i][1]) /* valid option char */
        )
     {