Hopefully now they'll be right

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

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

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