summaryrefslogtreecommitdiffstats
path: root/process.c
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 00:39:04 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-22 00:39:04 +0000
commit5a1c591126a76ee8739513f0363c5df415cedffd (patch)
treed72ee25cbfba24bab072f03daf4fb2289dfead0f /process.c
parent9bbb7a47133c3fab1230eeb45bc0a5b1d7c38f2c (diff)
downloadruby-5a1c591126a76ee8739513f0363c5df415cedffd.tar.gz
ruby-5a1c591126a76ee8739513f0363c5df415cedffd.tar.xz
ruby-5a1c591126a76ee8739513f0363c5df415cedffd.zip
* process.c (proc_exec_v, rb_proc_exec): preserve errno.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@13150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/process.c b/process.c
index 87fed73c5..624aeaefc 100644
--- a/process.c
+++ b/process.c
@@ -117,6 +117,9 @@ static VALUE S_Tms;
#endif
#endif
+#define preserving_errno(stmts) \
+ do {int saved_errno = errno; stmts; errno = saved_errno;} while (0)
+
/*
* call-seq:
@@ -990,7 +993,7 @@ proc_exec_v(argv, prog)
before_exec();
rb_thread_cancel_timer();
execv(prog, argv);
- after_exec();
+ preserving_errno(after_exec());
return -1;
}
@@ -1059,7 +1062,7 @@ rb_proc_exec(str)
#else
before_exec();
execl("/bin/sh", "sh", "-c", str, (char *)NULL);
- after_exec();
+ preserving_errno(after_exec());
#endif
#endif
return -1;