diff options
| author | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-08 11:14:53 +0000 |
|---|---|---|
| committer | eban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-08 11:14:53 +0000 |
| commit | 19f57ce1443f309c726aef8e5316efde1dfece8e (patch) | |
| tree | 567b0cb667916ef007fa5906a3ec1b8a7d88aaad /process.c | |
| parent | 3f5646312944b77463f7576c275702e9896abb93 (diff) | |
* process.c (rb_spawn): support for DJGPP.
* lib/mkmf.rb (VPATH): specify the implicit path separator for DJGPP.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
| -rw-r--r-- | process.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -600,7 +600,7 @@ rb_waitpid(pid, st, flags) goto retry; } #else /* NO_WAITPID */ - if (pid_tbl && st_lookup(pid_tbl, pid, st)) { + if (pid_tbl && st_lookup(pid_tbl, pid, (st_data_t *)st)) { last_status_set(*st, pid); st_delete(pid_tbl, (st_data_t*)&pid, NULL); return pid; @@ -626,7 +626,7 @@ rb_waitpid(pid, st, flags) } if (!pid_tbl) pid_tbl = st_init_numtable(); - st_insert(pid_tbl, pid, st); + st_insert(pid_tbl, pid, (st_data_t)st); if (!rb_thread_alone()) rb_thread_schedule(); } #endif @@ -1141,6 +1141,7 @@ proc_spawn_v(argv, prog) #endif before_exec(); status = spawnv(P_WAIT, prog, argv); + last_status_set(status == -1 ? 127 : status, 0); after_exec(); return status; #endif @@ -1181,6 +1182,7 @@ proc_spawn(str) char *shell = dln_find_exe("sh", 0); before_exec(); status = shell?spawnl(P_WAIT,shell,"sh","-c",str,(char*)NULL):system(str); + last_status_set(status == -1 ? 127 : status, 0); after_exec(); return status; } @@ -1597,7 +1599,7 @@ rb_spawn(argc, argv) if (prog && argc) argv[0] = prog; #else if (prog && argc) argv[0] = prog; - prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); + if (argc) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); status = system(StringValuePtr(prog)); # if defined(__human68k__) || defined(__DJGPP__) last_status_set(status == -1 ? 127 : status, 0); |