From 5de33d8fa3804de75b60dd4fcbfebc626c7dac89 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Wed, 22 Aug 2007 00:39:04 +0000 Subject: * process.c (proc_exec_v, rb_proc_exec): preserve errno. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@13150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ process.c | 7 +++++-- version.h | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcf72fef98..e28071022d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Aug 22 09:38:43 2007 Nobuyoshi Nakada + + * process.c (proc_exec_v, rb_proc_exec): preserve errno. + Wed Aug 22 09:00:23 2007 Nobuyoshi Nakada * eval.c (ruby_cleanup): return EXIT_FAILURE if any exceptions occured diff --git a/process.c b/process.c index 87fed73c50..624aeaefc8 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; diff --git a/version.h b/version.h index 19e35f330f..4b08ac0a5f 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2007-08-22" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20070822 -#define RUBY_PATCHLEVEL 49 +#define RUBY_PATCHLEVEL 50 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3