fixed bugs and errors

dln_search_exe_r now automatically appends .exe if the program searched
for doesn't end in .exe while searching
spawn now properly uses the provided module rather than executing
everything in a cmd/sh module
fixed piping of modules not called via cmd/sh

Author: MrBlaTi

src/dln.c

@@ -36,11 +36,31 @@
 static char *dln_find_1(const char *fname, const char *path, char *buf, size_t size, int exe_flag);
 char* dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size);
 char* dln_find_file_r(const char *fname, const char *path, char *buf, size_t size);
+char * stringReplace(char *search, char *replace, char *string);
+
 
 char*
 dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
 {
  	char *envpath = 0;
+  char working_copy[80];
+
+
+/* TODO This is a workaround to stop dln_fin_exe_r from returning
+  e.g. "echo %MYVAR% > tmp/spawn.txt" AS ABSOLUTE PATH
+  TO EXECUTABLE "echo %MYVAR% > tmp/spawn.txt" because that's total nonsense
+  and a cause for errors
+  On second thought, this would also eliminate any path with included whitespaces*/
+  // if(strrchr(fname, ' '))
+  //   return NULL;
+
+  strcpy(working_copy,fname);
+
+
+#if !defined(__APPLE__) || !defined(__linux__)
+  if(!strstr(working_copy, ".exe"))
+    strcat(working_copy, ".exe");
+#endif
 
   	if (!path) {
     	path = getenv(PATH_ENV);
@@ -57,11 +77,15 @@ dln_find_exe_r(const char *fname, const char *path, char *buf, size_t size)
 	     	".";
   	}
 
-  	buf = dln_find_1(fname, path, buf, size, 1);
+  	buf = dln_find_1(working_copy, path, buf, size, 1);
 
   	if (envpath)
   		free(envpath);
-
+  // printf("first buf %s\n", buf);
+// #if !defined(__APPLE__) && !defined(__linux__)
+//     stringReplace("/", "\\", buf);
+// #endif
+  // printf("secon buf %s\n", buf);
 	return buf;
 }
 
@@ -255,3 +279,42 @@ dln_find_1(const char *fname, const char *path, char *fbuf, size_t size, int exe
 	    /* otherwise try the next component in the search path */
     }
 }
+
+
+
+char * stringReplace(char *search, char *replace, char *string) {
+	char *tempString, *searchStart;
+	int len=0;
+
+
+	// preuefe ob Such-String vorhanden ist
+	searchStart = strstr(string, search);
+	if(searchStart == NULL) {
+		return string;
+	}
+
+	// Speicher reservieren
+	tempString = (char*) malloc(strlen(string) * sizeof(char));
+	if(tempString == NULL) {
+		return NULL;
+	}
+
+	// temporaere Kopie anlegen
+	strcpy(tempString, string);
+
+	// ersten Abschnitt in String setzen
+	len = searchStart - string;
+	string[len] = '\0';
+
+	// zweiten Abschnitt anhaengen
+	strcat(string, replace);
+
+	// dritten Abschnitt anhaengen
+	len += strlen(search);
+	strcat(string, (char*)tempString+len);
+
+	// Speicher freigeben
+	free(tempString);
+
+	return string;
+}

src/internal.c

@@ -85,7 +85,7 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
     char **result;
     char *shell;
     const char *tCmd, *fCmd;
-	char buf[80];
+  	char buf[80];
     mrb_value argv0 = mrb_nil_value();
 
     ai = mrb_gc_arena_save(mrb);
@@ -101,12 +101,17 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
     tCmd = mrb_string_value_ptr(mrb, argv[0]);
     fCmd = dln_find_exe_r(tCmd, 0, buf, sizeof(buf));
 
+
     do_exit = !fCmd && strncmp("exit", tCmd, 4) == 0;
     use_cmd = (!strrchr(tCmd, ' ') && (fCmd || (!do_exit && argc > 1))) ? 1 : 0;
 
+    use_cmd = use_cmd && fCmd;
+
     if (use_cmd) {
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 1));
         mrb_execarg_argv_to_strv(mrb, argv, argc, result);
+        // result[0] = fCmd;
+        // result[1] =
     } else {
         argc   = 3;
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 1));
@@ -190,7 +195,6 @@ mrb_execarg_argv_to_strv(mrb_state *mrb, mrb_value *argv, mrb_int len, char **re
 
     for (i = 0; i < len; i++) {
         buf = (char *)mrb_string_value_cstr(mrb, &argv[i]);
-
         *result = buf;
         result++;
     }

src/win32.c

@@ -372,13 +372,12 @@ spawnv(const char *shell, char *const argv[], mrb_value in, mrb_value out, mrb_v
     WCHAR *wcmd, *wshell;
     pid_t ret = -1;
     char *cmd = argv_to_str(argv);
-    char tCmd[strlen(cmd)];
     char tShell[strlen(shell)];
     HANDLE input, output, error;
 
-    strcpy(tCmd,cmd);
     strcpy(tShell,shell);
 
+
     if(mrb_cptr_p(in)){
       input = mrb_cptr(in);
     }
@@ -393,7 +392,8 @@ spawnv(const char *shell, char *const argv[], mrb_value in, mrb_value out, mrb_v
 
 
     wshell = str_to_wstr(tShell, strlen(tShell));
-    wcmd   = str_to_wstr(tCmd, strlen(tCmd));
+    wcmd   = str_to_wstr(cmd, strlen(cmd));
+
 
     ret = child_result(CreateChild(wshell, wcmd, NULL, input, output, error, 0, NULL), P_NOWAIT);
 
@@ -489,7 +489,7 @@ CreateChild(const WCHAR *shell, const WCHAR *cmd, SECURITY_ATTRIBUTES *psa,
         return NULL;
     }
 
-    fRet = CreateProcessW(shell, (WCHAR*) cmd, psa, psa,
+    fRet = CreateProcessW(shell, cmd, psa, psa,
                           psa->bInheritHandle, dwCreationFlags, env, NULL,
                           &aStartupInfo, &aProcessInformation);
 

test/process.rb

@@ -151,6 +151,14 @@ def assert_windows(*args, &block)
     wait_for_pid(pid)
 
     assert_equal var * 2, read('tmp/pipe.txt')
+
+    pid = spawn("readelf", "-v", out: pip)
+
+    wait_for_pid(pid)
+
+    assert_include read('tmp/pipe.txt'), 'GNU readelf (GNU Binutils)'
+
+    # assert_equal var * 2, read('tmp/pipe.txt')
   ensure
     IO._sysclose(pip) if OS.posix?
   end