Implemented OS specific implementations for func_shell for more flexability

diff --git a/include/xmake/xmake.h b/include/xmake/xmake.h
index 1c3db3faef60c5c01f544fe9722078b25c8773d2..78c67be8c07a62765656e4b2995a08235ddae3e7 100644 (file)
--- a/include/xmake/xmake.h
+++ b/include/xmake/xmake.h
@@ -20,9 +20,6 @@ struct xmake_state {
     
     char *path;
     int quiet, no_print;
-    
-    int dry_run;
-    int ignore_errors;
 
 };
 

diff --git a/lib.c b/lib.c
index c6d1bde45dadc45aaeeba3d69cad42e0e60d77fb..32e53d97402e14f2a5bf7750e151e0dd16b101ea 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -58,24 +58,6 @@ static int set_quiet (const char *arg) {
 
 }
 
-static int set_ignore_errors (const char *arg) {
-
-    (void) arg;
-    
-    state->ignore_errors = 1;
-    return 0;
-
-}
-
-static int set_dry_run (const char *arg) {
-
-    (void) arg;
-    
-    state->dry_run = 1;
-    return 0;
-
-}
-
 static int set_no_print (const char *arg) {
 
     (void) arg;
@@ -197,14 +179,6 @@ static struct option opts[] = {
     {   "--file=",                  &add_makefile           },
     {   "-f:",                      &add_makefile           },
     
-    {   "--ignore-errors",          &set_ignore_errors      },
-    {   "-i",                       &set_ignore_errors      },
-    
-    {   "--dry_run",                &set_dry_run            },
-    {   "-n",                       &set_dry_run            },
-    
-    
-    
     {   0,                          &non_option             }
 
 };

diff --git a/read.c b/read.c
index f4556e821f42b54c973e225bc46f169af8850502..a041b3211b3e0039c5a209e236ddef0a748dc5c3 100644 (file)
--- a/read.c
+++ b/read.c
@@ -837,12 +837,7 @@ int read_makefile (const char *filename) {
     char *new_value;
     int ret;
     
-    if (strcmp (filename, "-") == 0) {
-    
-        filename = "<stdin>";
-        lbuf.f = stdin;
-    
-    } else if (!(lbuf.f = fopen (filename, "r"))) {
+    if (!(lbuf.f = fopen (filename, "r"))) {
         return 1;
     }
     
@@ -872,11 +867,9 @@ int read_makefile (const char *filename) {
     }
     
     ret = read_lbuf (&lbuf, 1);
-    free (lbuf.start);
     
-    if (lbuf.f != stdin) {
-        fclose (lbuf.f);
-    }
+    free (lbuf.start);
+    fclose (lbuf.f);
     
     return ret;
 

diff --git a/variable.c b/variable.c
index e7ee37c8366f5757dc0d1dac04317f4cbaae647e..5d5df8ccda91f703989e81f202c41ab8d02d2fc7 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -796,11 +796,8 @@ void parse_var_line (const char *filename, unsigned long line_no, char *line, en
     
     } else if (opt == VAR_SHELL) {
     
-        char *temp = xstrdup (new_value);
-        free (new_value);
-        
-        new_value = variable_expand_line (filename, line_no, func_shell (filename, line_no, temp));
-        free (temp);
+        fprintf (stderr, "+++internal error: != not supported yet. Stop.\n");
+        exit (EXIT_FAILURE);
     
     }
     

diff --git a/xmake.c b/xmake.c
index bd0243cfa3b4ee045dab37878d14815f58ce62b9..08bd2a9733354ffab3ce8ad9ee6d9d83a87cf290 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -36,12 +36,9 @@ 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);
@@ -50,7 +47,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 == '@' || *s == '+') {
+    while (isspace ((int) *s) || *s == '-' || *s == '@') {
     
         if (*s == '@') {
             is_quiet = 1;
@@ -60,10 +57,6 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
             is_ignoring_errors = 1;
         }
         
-        if (*s == '+') {
-            should_execute = 1;
-        }
-        
         s++;
     
     }
@@ -72,7 +65,7 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
         printf ("%s\n", new_cmds);
     }
     
-    if (should_execute) {
+    /*if (!dry_run) */{
     
         int error = system (s);
         
@@ -498,12 +491,15 @@ 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);
     
@@ -566,15 +562,21 @@ int main (int argc, char **argv) {
     
     {
     
-        char *path, *cwd = get_current_directory ();
+        char *cwd, *path;
+        size_t len;
         
-        path = xmalloc (strlen ("CURDIR") + 4 + strlen (cwd) + 1);
+        cwd = get_current_directory ();
+        len = strlen ("CURDIR") + 4 + strlen (cwd);
+        
+        path = xmalloc (len + 1);
         sprintf (path, "CURDIR ?= %s", cwd);
         
         parse_var_line ("<command-line>", 1, path, VAR_ORIGIN_FILE);
         free (path);
         
-        path = xmalloc (strlen (".CURDIR") + 4 + strlen (cwd) + 1);
+        len = strlen (".CURDIR") + 4 + strlen (cwd);
+        
+        path = xmalloc (len + 1);
         sprintf (path, ".CURDIR ?= %s", cwd);
         
         parse_var_line ("<command-line>", 1, path, VAR_ORIGIN_FILE);