Another commit to try fix whatever git has done to the files

diff --git a/xmake.c b/xmake.c
index 08bd2a9733354ffab3ce8ad9ee6d9d83a87cf290..bd0243cfa3b4ee045dab37878d14815f58ce62b9 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -36,9 +36,12 @@ static int doing_inference_rule_commands = 0;
 
 static int rule_run_command (const char *filename, unsigned long line_no, const char *name, char *p, char *q) {
 
-    int is_quiet = state->quiet, is_ignoring_errors = 0;
     char *new_cmds, *s;
     
+    int is_ignoring_errors = state->ignore_errors;
+    int is_quiet = state->quiet;
+    int should_execute = !state->dry_run;
+    
     *q = '\0';
     
     new_cmds = xstrdup (p);
@@ -47,7 +50,7 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
     new_cmds = variable_expand_line ("<command-line>", 1, new_cmds);
     s = new_cmds;
     
-    while (isspace ((int) *s) || *s == '-' || *s == '@') {
+    while (isspace ((int) *s) || *s == '-' || *s == '@' || *s == '+') {
     
         if (*s == '@') {
             is_quiet = 1;
@@ -57,6 +60,10 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
             is_ignoring_errors = 1;
         }
         
+        if (*s == '+') {
+            should_execute = 1;
+        }
+        
         s++;
     
     }
@@ -65,7 +72,7 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
         printf ("%s\n", new_cmds);
     }
     
-    /*if (!dry_run) */{
+    if (should_execute) {
     
         int error = system (s);
         
@@ -491,15 +498,12 @@ int main (int argc, char **argv) {
     variable_add (xstrdup ("OS"), xstrdup (os_name), VAR_ORIGIN_FILE);
     variable_add (xstrdup ("MAKE"), xstrdup (argv[0]), VAR_ORIGIN_FILE);
     
-<<<<<<< HEAD
 #if     defined (_WIN32) || defined (__WIN32__)
     variable_add (xstrdup ("SHELL"), xstrdup ("sh.exe"), VAR_ORIGIN_FILE);
 #else
     variable_add (xstrdup ("SHELL"), xstrdup ("/bin/sh"), VAR_ORIGIN_FILE);
 #endif
     
-=======
->>>>>>> parent of 8f81312 (More support)
     state = xmalloc (sizeof (*state));
     parse_args (argv, argc);
     
@@ -562,21 +566,15 @@ int main (int argc, char **argv) {
     
     {
     
-        char *cwd, *path;
-        size_t len;
+        char *path, *cwd = get_current_directory ();
         
-        cwd = get_current_directory ();
-        len = strlen ("CURDIR") + 4 + strlen (cwd);
-        
-        path = xmalloc (len + 1);
+        path = xmalloc (strlen ("CURDIR") + 4 + strlen (cwd) + 1);
         sprintf (path, "CURDIR ?= %s", cwd);
         
         parse_var_line ("<command-line>", 1, path, VAR_ORIGIN_FILE);
         free (path);
         
-        len = strlen (".CURDIR") + 4 + strlen (cwd);
-        
-        path = xmalloc (len + 1);
+        path = xmalloc (strlen (".CURDIR") + 4 + strlen (cwd) + 1);
         sprintf (path, ".CURDIR ?= %s", cwd);
         
         parse_var_line ("<command-line>", 1, path, VAR_ORIGIN_FILE);