diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-03 06:26:22 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-03 06:26:22 +0000 |
commit | 1f81e3a8d7820b8a30f6f125f9947f9c8a250743 (patch) | |
tree | b7456c7d54da6f12e7bb779de8484f618bd1df70 /process.c | |
parent | 4fc6b25289fe83e4cede024d9fea83217bffdc7e (diff) |
merge revision(s) 13479:13481:
* process.c (struct rb_exec_arg): proc should be a VALUE.
* process.c (rb_f_exec): suppress a warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@16779 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 95 |
1 files changed, 65 insertions, 30 deletions
@@ -851,19 +851,19 @@ static VALUE detach_process_watcher(arg) void *arg; { - int pid = (int)arg, status; + int pid = (int)(VALUE)arg, status; while (rb_waitpid(pid, &status, WNOHANG) == 0) { rb_thread_sleep(1); } - return Qnil; + return rb_last_status; } VALUE rb_detach_process(pid) int pid; { - return rb_thread_create(detach_process_watcher, (void*)pid); + return rb_thread_create(detach_process_watcher, (void*)(VALUE)pid); } @@ -882,6 +882,11 @@ rb_detach_process(pid) * terminate. <code>detach</code> only checks the status * periodically (currently once each second). * + * The waiting thread returns the exit status of the detached process + * when it terminates, so you can use <code>Thread#join</code> to + * know the result. If specified _pid_ is not a valid child process + * ID, the thread returns +nil+ immediately. + * * In this first example, we don't reap the first child process, so * it appears as a zombie in the process status display. * @@ -1070,8 +1075,8 @@ rb_proc_exec(str) a = argv = ALLOCA_N(char*, (s-str)/2+2); ss = ALLOCA_N(char, s-str+1); strcpy(ss, str); - if (*a++ = strtok(ss, " \t")) { - while (t = strtok(NULL, " \t")) { + if ((*a++ = strtok(ss, " \t")) != 0) { + while ((t = strtok(NULL, " \t")) != 0) { *a++ = t; } *a = NULL; @@ -1190,6 +1195,53 @@ proc_spawn(sv) #endif #endif +struct rb_exec_arg { + int argc; + VALUE *argv; + VALUE prog; +}; + +static void +proc_prepare_args(e, argc, argv, prog) + struct rb_exec_arg *e; + int argc; + VALUE *argv; + VALUE prog; +{ + int i; + + MEMZERO(e, struct rb_exec_arg, 1); + if (prog) { + SafeStringValue(prog); + StringValueCStr(prog); + } + for (i = 0; i < argc; i++) { + SafeStringValue(argv[i]); + StringValueCStr(argv[i]); + } + security(RSTRING(prog ? prog : argv[0])->ptr); + e->prog = prog; + e->argc = argc; + e->argv = argv; +} + +static VALUE +proc_exec_args(earg) + VALUE earg; +{ + struct rb_exec_arg *e = (struct rb_exec_arg *)earg; + int argc = e->argc; + VALUE *argv = e->argv; + VALUE prog = e->prog; + + if (argc == 1 && prog == 0) { + return (VALUE)rb_proc_exec(RSTRING(argv[0])->ptr); + } + else { + return (VALUE)proc_exec_n(argc, argv, prog); + } +} + /* * call-seq: * exec(command [, arg, ...]) @@ -1222,8 +1274,10 @@ rb_f_exec(argc, argv) { VALUE prog = 0; VALUE tmp; + struct rb_exec_arg earg; if (argc == 0) { + rb_last_status = Qnil; rb_raise(rb_eArgError, "wrong number of arguments"); } @@ -1236,15 +1290,8 @@ rb_f_exec(argc, argv) argv[0] = RARRAY(tmp)->ptr[1]; SafeStringValue(prog); } - if (argc == 1 && prog == 0) { - VALUE cmd = argv[0]; - - SafeStringValue(cmd); - rb_proc_exec(RSTRING(cmd)->ptr); - } - else { - proc_exec_n(argc, argv, prog); - } + proc_prepare_args(&earg, argc, argv, prog); + proc_exec_args((VALUE)&earg); rb_sys_fail(RSTRING(argv[0])->ptr); return Qnil; /* dummy */ } @@ -1501,7 +1548,7 @@ rb_f_system(argc, argv) #else volatile VALUE prog = 0; int pid; - int i; + struct rb_exec_arg earg; RETSIGTYPE (*chfunc)(int); fflush(stdout); @@ -1518,27 +1565,15 @@ rb_f_system(argc, argv) prog = RARRAY(argv[0])->ptr[0]; argv[0] = RARRAY(argv[0])->ptr[1]; } + proc_prepare_args(&earg, argc, argv, prog); - if (prog) { - SafeStringValue(prog); - StringValueCStr(prog); - } - for (i = 0; i < argc; i++) { - SafeStringValue(argv[i]); - StringValueCStr(argv[i]); - } - security(RSTRING(prog ? prog : argv[0])->ptr); chfunc = signal(SIGCHLD, SIG_DFL); retry: pid = fork(); if (pid == 0) { /* child process */ - if (argc == 1 && prog == 0) { - rb_proc_exec(RSTRING(argv[0])->ptr); - } - else { - proc_exec_n(argc, argv, prog); - } + rb_thread_atfork(); + rb_protect(proc_exec_args, (VALUE)&earg, NULL); _exit(127); } if (pid < 0) { |