Added checks and remove shell/pipe implementations

diff --git a/include/xmake/xmake.h b/include/xmake/xmake.h
index 1c3db3faef60c5c01f544fe9722078b25c8773d2..07e9bcff7c8c5fa39ee3be2431861cffd99430f6 100644 (file)
--- a/include/xmake/xmake.h
+++ b/include/xmake/xmake.h
@@ -26,6 +26,12 @@ struct xmake_state {
 
 };
 
+#if     defined (__PDOS386__)
+# ifndef        __PDOS__
+#  define   __PDOS__
+# endif
+#endif
+
 extern struct xmake_state *state;
 extern const char *program_name;
 

diff --git a/variable.c b/variable.c
index 525be394813fa81230ff6cd08c7b257b47a37432..7545c967bd53e90cbf9028b1018e8f5a1c21f4b6 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -5,7 +5,7 @@
 #include    <stdlib.h>
 #include    <string.h>
 
-#if     !defined (_WIN32) && !defined (__WIN32__) && !defined (__MSDOS__)
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
 # define        __USE_POSIX
 #endif
 
@@ -48,8 +48,9 @@ static char *func_error (const char *filename, unsigned long line_no, char *inpu
 
 }
 
-#if     defined (_WIN32) || defined (__WIN32__)
-# include       <windows.h>
+#if     !defined (__PDOS__) && !defined (__MSDOS__)
+# if        defined (_WIN32) || defined (__WIN32__)
+#  include      <windows.h>
 static char *func_shell (const char *filename, unsigned long line_no, char *input) {
 
     DWORD dwExitCode;
@@ -209,10 +210,10 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     return lbuf.start;
 
 }
-#else
-# include       <sys/wait.h>
-# include       <errno.h>
-# include       <unistd.h>
+# else
+#  include      <sys/wait.h>
+#  include      <errno.h>
+#  include      <unistd.h>
 static char *func_shell (const char *filename, unsigned long line_no, char *input) {
 
     int pipefd[2], pid, status;
@@ -319,12 +320,16 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     return lbuf.start;
 
 }
+# endif
 #endif
 
 static struct builtin_function builtin_functions[] ={
 
     {   "error",    &func_error     },
+    
+#if     !defined (__PDOS__) && !defined (__MSDOS__)
     {   "shell",    &func_shell     },
+#endif
     
     {   "eval",     &func_eval      },
     {   0,          0               }
@@ -827,11 +832,20 @@ void parse_var_line (const char *filename, unsigned long line_no, char *line, en
     
     } else if (opt == VAR_SHELL) {
     
+#if     defined (__PDOS__) || defined (__MSDOS__)
+
+        fprintf (stderr, "%s: 'MACRO != value' isn't supported due to OS limitations. Stop.\n");
+        exit (EXIT_FAILURE);
+
+#else
+        
         char *temp = xstrdup (new_value);
         free (new_value);
         
         new_value = variable_expand_line (filename, line_no, func_shell (filename, line_no, temp));
         free (temp);
+        
+#endif
     
     }
     

diff --git a/xmake.c b/xmake.c
index ae48b2882adbbab0b804a6cdcba908f21e5ffa98..f89f5f7b2fd99dc39ae0f91f3013c9a16fea72f2 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -5,7 +5,7 @@
 #include    <stdlib.h>
 #include    <string.h>
 
-#if     !defined (_WIN32) && !defined (__WIN32__) && !defined (__MSDOS__)
+#if     defined (unix) || defined (__unix) || defined (__unix__) || defined (__APPLE__)
 # define        __USE_POSIX
 #endif
 
@@ -25,7 +25,7 @@ const char *program_name = 0;
 
 #if     defined (_WIN32) || defined (__WIN32__)
 const char *os_name = "Windows_NT";
-#elif   defined (__PDOS386__)
+#elif   defined (__PDOS__)
 const char *os_name = "PDOS";
 #elif   defined (__MSDOS__)
 const char *os_name = "MSDOS";
@@ -48,8 +48,9 @@ struct linebuf {
 
 static int doing_inference_rule_commands = 0;
 
-#if     defined (_WIN32) || defined (__WIN32__)
-# include       <windows.h>
+#if     !defined (__PDOS__) && !defined (__MSDOS__)
+# if        defined (_WIN32) || defined (__WIN32__)
+#  include      <windows.h>
 static void pipe_command (const char *filename, unsigned long line_no, char *input, int is_ignoring_errors, const char *name) {
 
     DWORD dwExitCode;
@@ -106,10 +107,10 @@ static void pipe_command (const char *filename, unsigned long line_no, char *inp
     }
 
 }
-#else
-# include       <sys/wait.h>
-# include       <errno.h>
-# include       <unistd.h>
+# else
+#  include      <sys/wait.h>
+#  include      <errno.h>
+#  include      <unistd.h>
 static void pipe_command (const char *filename, unsigned long line_no, char *input, int is_ignoring_errors, const char *name) {
 
     int pipefd[2], pid, status;
@@ -170,6 +171,7 @@ static void pipe_command (const char *filename, unsigned long line_no, char *inp
     }
 
 }
+# endif
 #endif
 
 static int rule_run_command (const char *filename, unsigned long line_no, const char *name, char *p, char *q) {
@@ -210,9 +212,32 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
         printf ("%s\n", new_cmds);
     }
     
-    if (should_execute) { pipe_command (filename, line_no, s, is_ignoring_errors, name); }
-    free (new_cmds);
+    if (should_execute) {
+    
+#if     defined (__PDOS__) || defined (__MSDOS__)
+
+        int status = system (s);
+        
+        if (!is_ignoring_errors && status) {
+        
+            char *space, *p = s;
+            
+            if ((space = strchr (p, ' '))) {
+                p = xstrndup (p, space - p);
+            }
+            
+            fprintf (stderr, "%s: %s: No such file or directory\n", program_name, p);
+            fprintf (stderr, "%s: *** [%s:%lu: %s] Error %d\n", program_name, filename, line_no, name, status);
+        
+        }
+
+#else
+        pipe_command (filename, line_no, s, is_ignoring_errors, name);
+#endif
     
+    }
+    
+    free (new_cmds);
     return 0;
 
 }