test

Signed-off-by: Lars-Peter Clausen <[email protected]>

Author: larsclausen

driver/main.c

@@ -321,6 +321,35 @@ static const char*my_tempfile(const char*str, FILE**fout)
       return pathbuf;
 }
 
+#ifdef __MINGW32__
+static int run_cmd(const char *cmd)
+{
+      char *cmd2;
+      int len;
+      int rc;
+
+      len = strlen(cmd) + 13;
+      cmd2 = malloc(len);
+      rc = snprintf(cmd2, len, "cmd /S /C \"%s\"", cmd);
+      if (rc < 0)
+	    return rc;
+
+      if (verbose_flag)
+	    fprintf(stderr, "Executing: %s", cmd2);
+
+      rc = system(cmd2);
+      free(cmd2);
+
+      return rc;
+}
+#else
+static int run_cmd(const char *cmd)
+{
+      return system(cmd);
+}
+
+#endif
+
 static int t_version_only(void)
 {
       int rc;
@@ -329,15 +358,15 @@ static int t_version_only(void)
 
       fflush(0);
       snprintf(tmp, sizeof tmp, "\"%s%civlpp\" -V", ivlpp_dir, sep);
-      rc = system(tmp);
+      rc = run_cmd(tmp);
       if (rc != 0) {
 	    fprintf(stderr, "Unable to get version from \"%s\"\n", tmp);
       }
 
       fflush(0);
       snprintf(tmp, sizeof tmp, "\"%s%civl\" -V -C\"%s\" -C\"%s\"", base, sep,
 	       iconfig_path, iconfig_common_path);
-      rc = system(tmp);
+      rc = run_cmd(tmp);
       if (rc != 0) {
 	    fprintf(stderr, "Unable to get version from \"%s\"\n", tmp);
       }
@@ -388,7 +417,7 @@ static int t_preprocess_only(void)
       if (verbose_flag)
 	    printf("preprocess: %s\n", cmd);
 
-      rc = system(cmd);
+      rc = run_cmd(cmd);
       remove(source_path);
       free(source_path);
 
@@ -489,7 +518,7 @@ static int t_compile(void)
 	    printf("translate: %s\n", cmd);
 
 
-      rc = system(cmd);
+      rc = run_cmd(cmd);
       if ( ! getenv("IVERILOG_ICONFIG")) {
 	    remove(source_path);
 	    free(source_path);

ivlpp/lexor.lex

@@ -2114,7 +2114,7 @@ static void open_input_file(struct include_stack_t*isp)
 	    return;
       }
 
-      size_t cmdlen = strlen(vhdlpp_path);
+      size_t cmdlen = strlen(vhdlpp_path) + 12;
       cmdlen += strlen(isp->path);
       cmdlen += 8+strlen(vhdlpp_work);
 
@@ -2130,7 +2130,11 @@ static void open_input_file(struct include_stack_t*isp)
       cmdlen += liblen;
 
       char*cmd = malloc(cmdlen);
+#ifdef __MINGW32__
+      snprintf(cmd, cmdlen, "cmd /S /C \"%s -w\"%s\"%s %s\"", vhdlpp_path, vhdlpp_work, libs, isp->path);
+#else
       snprintf(cmd, cmdlen, "%s -w\"%s\"%s %s", vhdlpp_path, vhdlpp_work, libs, isp->path);
+#endif
 
       if (verbose_flag) fprintf(stderr, "Invoke vhdlpp: %s\n", cmd);
 

pform.cc

@@ -3410,12 +3410,13 @@ int pform_parse(const char*path)
       if (strcmp(path, "-") == 0) {
 	    vl_input = stdin;
       } else if (ivlpp_string) {
-	    char*cmdline = (char*)malloc(strlen(ivlpp_string) +
-					        strlen(path) + 4);
-	    strcpy(cmdline, ivlpp_string);
-	    strcat(cmdline, " \"");
-	    strcat(cmdline, path);
-	    strcat(cmdline, "\"");
+	    size_t cmdlen = strlen(ivlpp_string) + strlen(path) + 16;
+	    char*cmdline = (char*)malloc(cmdlen);
+#ifdef __MINGW32__
+	    snprintf(cmdline, cmdlen, "cmd /S /C \"%s \"%s\"\"", ivlpp_string, path);
+#else
+	    snprintf(cmdline, cmdlen, "%s \"%s\"", ivlpp_string, path);
+#endif
 
 	    if (verbose_flag)
 		  cerr << "Executing: " << cmdline << endl<< flush;