fixes 081e45f

Author: katzer

.travis.yml

@@ -28,10 +28,6 @@ env:
 - MRUBY_VERSION=1.2.0
 - MRUBY_VERSION=head
 
-matrix:
-  allow_failures:
-  - env: MRUBY_VERSION=1.2.0
-
 script:
 - rake compile
 - rake test

src/internal.c

@@ -81,17 +81,14 @@ mrb_execarg_new(mrb_state *mrb)
 static void
 mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, mrb_value opts, struct mrb_execarg *eargp)
 {
-    int ai, use_cmd;
+    int ai, use_cmd, do_exit;
     char **result;
     char *shell;
-    char *dln_cmd;
-    const char *tCmd;
-	  char fbuf[/*MAXPATHLEN*/80]; // TODO
+    const char *tCmd, *fCmd;
+	char buf[80];
     mrb_value argv0 = mrb_nil_value();
 
-    ai   = mrb_gc_arena_save(mrb);
-    tCmd = mrb_string_value_ptr(mrb, argv[0]);
-    dln_cmd = dln_find_exe_r(tCmd, 0, fbuf, sizeof(fbuf));
+    ai = mrb_gc_arena_save(mrb);
 
     if (mrb_hash_p(opts)) {
         eargp->fd.in  = mrb_hash_get(mrb, opts, mrb_check_intern(mrb, "in", 2));
@@ -101,11 +98,11 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
         eargp->fd.in  = eargp->fd.out = eargp->fd.err = mrb_nil_value();
     }
 
-#if defined(__APPLE__) || defined(__linux__)
-    use_cmd = ((argc > 1 || !strrchr(tCmd, ' ')) && dln_cmd) ? 1 : 0;
-#else
-    use_cmd = ((argc > 1 || strstr(tCmd, ".exe") || !strrchr(tCmd, ' ')) && dln_cmd) ? 1 : 0; //TODO bei z.B. readelf.exe -v wäre ohne dln_cmd use_cmd=1, aber dln_find_exe_r kann "readelf -v" nicht auflösen!
-#endif
+    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;
 
     if (use_cmd) {
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 1));
@@ -114,17 +111,13 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
         argc   = 3;
         result = (char **)mrb_malloc(mrb, sizeof(char *) * (argc + 1));
 
-
-
-
-
     #if defined(__APPLE__) || defined(__linux__)
         shell = getenv("SHELL");
-        if (!shell) shell = strdup(dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf)));
+        if (!shell) shell = strdup("bin/sh");
         result[1] = strdup("-c");
     #else
         shell = getenv("ComSpec");
-        if (!shell) shell = strdup(dln_find_exe_r("cmd.exe", 0, fbuf, sizeof(fbuf)));
+        if (!shell) shell = strdup("C:\\WINDOWS\\system32\\cmd.exe");
         result[1] = strdup("/c");
     #endif
         result[0] = shell;
@@ -134,21 +127,16 @@ mrb_execarg_fill(mrb_state *mrb, mrb_value env, mrb_value *argv, mrb_int argc, m
     result[argc] = NULL;
 
 #if defined(__APPLE__) || defined(__linux__)
-    if (result[0][0] != '/') {
-      argv0 = mrb_str_new(mrb, dln_find_exe_r(tCmd, 0, fbuf, sizeof(fbuf)), 5); //TODO redundand?
+    if (fCmd && result[0][0] != '/') {
+        argv0 = mrb_str_new_cstr(mrb, fCmd);
     }
 #else
-    if (result[0][1] != ':') {
-      char *dln_result = dln_find_exe_r(tCmd, 0, fbuf, sizeof(fbuf));
-      argv0 = mrb_str_new(mrb, dln_result, strlen(dln_result) ); // TODO: !!!
+    if (fCmd && result[0][1] != ':') {
+        argv0 = mrb_str_new_cstr(mrb, fCmd);
     }
 #endif
 
-
-
-
     if (mrb_bool(argv0)) {
-        // mrb_str_cat_cstr(mrb, argv0, result[0]);
         result[0] = mrb_str_to_cstr(mrb, argv0);
     }
 

test/process.rb

@@ -34,7 +34,7 @@ def IO.sysopen(path, mod)
 
 def read(path)
   f = File.open(path)
-  f.read.to_s.strip
+  f.read.to_s.strip.sub("\r", '').sub("\n", '')
 ensure
   f.close if f
 end
@@ -110,10 +110,6 @@ def assert_windows(*args, &block)
   assert_raise(ArgumentError) { spawn }
   assert_raise(TypeError) { spawn 123 }
 
-  # This test fails on travis (returns status 0 even cmd does not exist)
-  # Suspended, now fails on windows as well
-  # assert_raise(RuntimeError) { wait_for_pid spawn('.exe') } unless ENV['TRAVIS']
-
   pid = spawn 'exit 0'
   wait_for_pid(pid)
 
@@ -128,11 +124,6 @@ def assert_windows(*args, &block)
 
   wait_for_pid(pid)
   assert_equal var, read('tmp/spawn.txt')
-
-  readelfpip = IO.sysopen('tmp/readelf.txt', 'w')
-  pid = spawn("readelf.exe -v", out: readelfpip)
-  # pid = spawn("readelf.exe", "-v", out: readelfpip) TODO pipe doesnt work with proper spawn call (spawn program directly w/o using cmd)
-  wait_for_pid(pid)
 end
 
 assert('Process.spawn', 'env') do
@@ -159,19 +150,19 @@ def assert_windows(*args, &block)
 
     wait_for_pid(pid)
 
-    assert_equal var * 2, read('tmp/pipe.txt').sub("\r", '').sub("\n", '')
+    assert_equal var * 2, read('tmp/pipe.txt')
   ensure
     IO._sysclose(pip) if OS.posix?
   end
 end
 
 assert('Process.spawn', 'pipe error') do
   begin
-    pip = IO.sysopen('tmp/pipe_error.txt', 'w')
-    pid = spawn("ls -asdw", err: pip)
+    pip = IO.sysopen('tmp/pipe.err', 'w')
+    pid = spawn('ruby unknown', err: pip)
 
     wait_for_pid(pid)
-    assert_include read('tmp/pipe_error.txt'), "ls: option requires an argument"
+    assert_false read('tmp/pipe.err').empty?
   ensure
     IO._sysclose(pip) if OS.posix?
   end