Bug fixes

diff --git a/include/xmake/lib.h b/include/xmake/lib.h
index d3eaf801bdf38615097b789cc3408274b6dbfa5c..d0afe68af5cd6495f8475b078aa5ecd6873cd617 100644 (file)
--- a/include/xmake/lib.h
+++ b/include/xmake/lib.h
@@ -17,6 +17,8 @@ struct option {
 
 };
 
+char *skip_whitespace (char *p);
+
 char *xstrdup (const char *__s);
 char *xstrndup (const char *__s, unsigned long __len);
 

diff --git a/lib.c b/lib.c
index c6d1bde45dadc45aaeeba3d69cad42e0e60d77fb..3afbd9ab4daf2e715de89c8f074386ec787a4f60 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -2,6 +2,7 @@
  * @file            lib.c
  *****************************************************************************/
 #include    <assert.h>
+#include    <ctype.h>
 #include    <stdio.h>
 #include    <stdlib.h>
 #include    <string.h>
@@ -361,6 +362,16 @@ static int match_arg (struct option opt, int argc, char **argv, int *ret) {
 }
 
 
+char *skip_whitespace (char *p) {
+
+    while (isspace ((int) *p)) {
+        p++;
+    }
+    
+    return p;
+
+}
+
 char *xstrdup (const char *__s) {
 
     char *p = xmalloc (strlen (__s) + 1);

diff --git a/read.c b/read.c
index f4556e821f42b54c973e225bc46f169af8850502..c6f8d373f173a234c5e134f73f01ae19ba9c5ea4 100644 (file)
--- a/read.c
+++ b/read.c
@@ -211,7 +211,7 @@ static int include_makefile (const char *src_filename, unsigned long line_no, co
             
             }
         
-        } else if (ch == '"') {
+        } else {
         
             if (!(end = strrchr (filename, '"'))) {
             
@@ -258,16 +258,6 @@ static int include_makefile (const char *src_filename, unsigned long line_no, co
 
 }
 
-static char *skip_whitespace (char *p) {
-
-    while (isspace ((int) *p)) {
-        p++;
-    }
-    
-    return p;
-
-}
-
 static int read_lbuf (struct linebuf *lbuf, int set_default) {
 
     struct nameseq* filenames = 0;

diff --git a/variable.c b/variable.c
index e7ee37c8366f5757dc0d1dac04317f4cbaae647e..525be394813fa81230ff6cd08c7b257b47a37432 100644 (file)
--- a/variable.c
+++ b/variable.c
@@ -61,11 +61,16 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     HANDLE hStdInPipeRead, hStdInPipeWrite;
     HANDLE hStdOutPipeRead, hStdOutPipeWrite;
     
+    char *lpApplicationName = 0, *lpCommandLine = skip_whitespace (input), *p, ch;
     struct linebuf lbuf;
-    char *p, ch;
     
-    char *cmd = xmalloc (strlen (getenv ("COMSPEC") + 4 + strlen (input) + 1);
-    sprintf (cmd, "%s /c %s", getenv ("COMSPEC"), input);
+    for (p = lpCommandLine; !isspace ((int) *p); p++) {
+    
+        if (*p == '/') {
+            *p = '\\';
+        }
+    
+    }
     
     memset (&sa, 0, sizeof (sa));
     memset (&si, 0, sizeof (si));
@@ -77,38 +82,38 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     if (!CreatePipe (&hStdInPipeRead, &hStdInPipeWrite, &sa, 0)) {
     
         fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
-        fprintf (stderr, "%s: %s:%lu: pipe: No error\n", program_name, filename, line_no);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
         
         exit (EXIT_FAILURE);
     
     }
     
-    /*if (!SetHandleInformation (g_stdout_read, HANDLE_FLAG_INHERIT, 0)) {
+    if (!SetHandleInformation (hStdInPipeRead, HANDLE_FLAG_INHERIT, 0)) {
     
         fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
-        fprintf (stderr, "%s: %s:%lu: pipe: No error\n", program_name, filename, line_no);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
         
         exit (EXIT_FAILURE);
     
-    }*/
+    }
     
     if (!CreatePipe (&hStdOutPipeRead, &hStdOutPipeWrite, &sa, 0)) {
     
         fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
-        fprintf (stderr, "%s: %s:%lu: pipe: No error\n", program_name, filename, line_no);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
         
         exit (EXIT_FAILURE);
     
     }
     
-    /*if (!SetHandleInformation (g_stdin_read, HANDLE_FLAG_INHERIT, 0)) {
+    if (!SetHandleInformation (hStdOutPipeRead, HANDLE_FLAG_INHERIT, 0)) {
     
         fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
-        fprintf (stderr, "%s: %s:%lu: pipe: No error\n", program_name, filename, line_no);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
         
         exit (EXIT_FAILURE);
     
-    }*/
+    }
     
     si.cb = sizeof (si);
     
@@ -118,10 +123,10 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     si.dwFlags |= STARTF_USESTDHANDLES;
     
-    if (!CreateProcess (getenv ("COMSPEC"), cmd, 0, 0, 1, CREATE_NO_WINDOW, 0, 0, &si, &pi)) {
+    if (!CreateProcess (lpApplicationName, lpCommandLine, 0, 0, 1, 0, 0, 0, &si, &pi)) {
     
         fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
-        fprintf (stderr, "%s: %s:%lu: pipe: No error\n", program_name, filename, line_no);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
         
         exit (EXIT_FAILURE);
     
@@ -176,13 +181,28 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     }
     
+    while (isspace ((int) *lbuf.start)) {
+        lbuf.start++;
+    }
+    
     p = lbuf.start;
     
-    while ((ch = *p++)) {
+    while ((ch = *p)) {
     
-        if (ch == '\n' || ch == '\r') {
-            p[-1] = ' ';
+        if (ch == '\n') {
+        
+            memmove (p, p + 1, strlen (p + 1));
+            *(p + strlen (p) - 1) = '\0';
+            
+            if (p[-1] == '\r') {
+                p[-1] = ' ';
+            }
+            
+            continue;
+        
         }
+        
+        p++;
     
     }
     
@@ -191,15 +211,15 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
 }
 #else
 # include       <sys/wait.h>
+# include       <errno.h>
 # include       <unistd.h>
 static char *func_shell (const char *filename, unsigned long line_no, char *input) {
 
-    FILE *cmd_output;
-    
-    struct linebuf lbuf;
+    int pipefd[2], pid, status;
     char *p, ch;
     
-    int pipefd[2], pid, status;
+    struct linebuf lbuf;
+    FILE *cmd_output;
     
     if (pipe (pipefd) < 0) {
     
@@ -217,14 +237,20 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     if (pid == 0) {
     
+        char *name = skip_whitespace (input), *space, *slash;
+        
+        if ((space = strchr (name, ' '))) {
+            name = xstrndup (name, space - name);
+        }
+        
         dup2 (pipefd[1], STDOUT_FILENO);
         
         close (pipefd[0]);
         close (pipefd[1]);
         
-        execl ("/bin/sh", program_name, "-c", input, NULL);
+        execl (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, skip_whitespace (space), NULL);
         
-        (void) filename; (void) line_no;
+        fprintf (stderr, "%s: %s:%lu: %s: %s\n", program_name, filename, line_no, name, strerror (errno));
         exit (EXIT_FAILURE);
     
     }
@@ -266,7 +292,12 @@ static char *func_shell (const char *filename, unsigned long line_no, char *inpu
     
     }
     
-    wait (&status);
+    if (waitpid (pid, &status, 0) == -1) {
+    
+        perror ("waitpid");
+        exit (EXIT_FAILURE);
+    
+    }
     
     if (status) {
     

diff --git a/xmake.c b/xmake.c
index 9b4920e359b7fdba7379f9113ff1692b0c2b8555..ae48b2882adbbab0b804a6cdcba908f21e5ffa98 100644 (file)
--- a/xmake.c
+++ b/xmake.c
@@ -2,10 +2,15 @@
  * @file            xmake.c
  *****************************************************************************/
 #include    <ctype.h>
-#include    <stdio.h>
 #include    <stdlib.h>
 #include    <string.h>
 
+#if     !defined (_WIN32) && !defined (__WIN32__) && !defined (__MSDOS__)
+# define        __USE_POSIX
+#endif
+
+#include    <stdio.h>
+
 #include    <xmake/cstr.h>
 #include    <xmake/lib.h>
 #include    <xmake/read.h>
@@ -32,8 +37,141 @@ const char *os_name = "Linux";
 const char *os_name = "Unix";
 #endif
 
+struct linebuf {
+
+    char *start;
+    unsigned long size;
+    
+    FILE *f;
+
+};
+
 static int doing_inference_rule_commands = 0;
 
+#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;
+    
+    PROCESS_INFORMATION pi;
+    STARTUPINFO si;
+    
+    char *lpApplicationName = 0, *lpCommandLine = skip_whitespace (input), *p;
+    
+    for (p = lpCommandLine; !isspace ((int) *p); p++) {
+    
+        if (*p == '/') {
+            *p = '\\';
+        }
+    
+    }
+    
+    memset (&si, 0, sizeof (si));
+    memset (&pi, 0, sizeof (pi));
+    
+    si.cb = sizeof (si);
+    
+    if (!CreateProcess (lpApplicationName, lpCommandLine, 0, 0, 0, 0, 0, 0, &si, &pi)) {
+    
+        fprintf (stderr, "process_begin: CreateProcess(NULL, %s, ...) failed.\n", input);
+        fprintf (stderr, "%s: %s:%lu: pipe: %s\n", program_name, filename, line_no, strerror (GetLastError ()));
+        
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    GetExitCodeProcess (pi.hProcess, &dwExitCode);
+    
+    CloseHandle (pi.hProcess);
+    CloseHandle (pi.hThread);
+    
+    if (dwExitCode) {
+    
+        if (!is_ignoring_errors) {
+        
+            char *space, *p = input;
+            
+            if ((space = strchr (p, ' '))) {
+                p = xstrndup (p, space - p);
+            }
+            
+            fprintf (stderr, "%s: %s: %s\n", program_name, p, strerror (GetLastError ()));
+            fprintf (stderr, "%s: *** [%s:%lu: %s] Error %ld\n", program_name, filename, line_no, name, dwExitCode);
+            
+            exit (EXIT_FAILURE);
+        
+        }
+    
+    }
+
+}
+#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;
+    
+    if (pipe (pipefd) < 0) {
+    
+        perror ("pipe");
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    if ((pid = fork ()) < 0) {
+    
+        perror ("fork");
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    if (pid == 0) {
+    
+        char *name = skip_whitespace (input), *space, *slash;
+        
+        if ((space = strchr (name, ' '))) {
+            name = xstrndup (name, space - name);
+        }
+        
+        execl (name, (slash = strrchr (name, '/')) ? (slash + 1) : name, skip_whitespace (space), NULL);
+        
+        fprintf (stderr, "%s: %s:%lu: %s: %s\n", program_name, filename, line_no, name, strerror (errno));
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    if (waitpid (pid, &status, 0) == -1) {
+    
+        perror ("waitpid");
+        exit (EXIT_FAILURE);
+    
+    }
+    
+    if (status) {
+    
+        if (!is_ignoring_errors) {
+        
+            char *space, *p = input;
+            
+            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);
+            
+            exit (EXIT_FAILURE);
+        
+        }
+    
+    }
+
+}
+#endif
+
 static int rule_run_command (const char *filename, unsigned long line_no, const char *name, char *p, char *q) {
 
     char *new_cmds, *s;
@@ -47,7 +185,7 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
     new_cmds = xstrdup (p);
     *q = '\n';
     
-    new_cmds = variable_expand_line ("<command-line>", 1, new_cmds);
+    new_cmds = variable_expand_line (filename, line_no, new_cmds);
     s = new_cmds;
     
     while (isspace ((int) *s) || *s == '-' || *s == '@' || *s == '+') {
@@ -72,20 +210,9 @@ static int rule_run_command (const char *filename, unsigned long line_no, const
         printf ("%s\n", new_cmds);
     }
     
-    if (should_execute) {
-    
-        int error = system (s);
-        
-        if (!is_ignoring_errors && error) {
-        
-            fprintf (stderr, "%s: *** [%s:%lu: %s] Error %d\n", program_name, filename, line_no, name, error);
-            return 1;
-        
-        }
-    
-    }
-    
+    if (should_execute) { pipe_command (filename, line_no, s, is_ignoring_errors, name); }
     free (new_cmds);
+    
     return 0;
 
 }