1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* hash.c (ruby_setenv): ENV.[]= should raise an error if setenv(3)

Browse Source 
or putenv(3) fails.  [ruby-dev:40023]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26279 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2010-01-11 03:58:39 +00:00
parent 73cd7b6697
commit af23025d77
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Jan 11 12:47:58 2010 Akinori MUSHA <knu@iDaemons.org>
* hash.c (ruby_setenv): ENV.[]= should raise an error if setenv(3)
or putenv(3) fails. [ruby-dev:40023]
Sun Jan 10 17:25:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jan 10 17:25:24 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/webrick/accesslog.rb : Escape needed. * lib/webrick/accesslog.rb : Escape needed.

1
NEWS
View File

@ -45,6 +45,7 @@ with all sufficient information, see the ChangeLog file.
* ENV * ENV
* Uses locale's encoding * Uses locale's encoding
* ENV.[]= raises Errno::{EINVAL,ENOMEM} etc. on failure.
* Float * Float
* new constants: * new constants:

14
hash.c
View File

@ -2064,10 +2064,13 @@ ruby_setenv(const char *name, const char *value)
#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV) #elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
#undef setenv #undef setenv
#undef unsetenv #undef unsetenv
if (value) if (value) {
setenv(name,value,1); if (setenv(name, value, 1))
else rb_sys_fail("setenv");
unsetenv(name); } else {
if (unsetenv(name))
rb_sys_fail("unsetenv");
}
#elif defined __sun__ #elif defined __sun__
size_t len = strlen(name); size_t len = strlen(name);
char **env_ptr, *str; char **env_ptr, *str;
@ -2081,7 +2084,8 @@ ruby_setenv(const char *name, const char *value)
if (value) { if (value) {
str = malloc(len += strlen(value) + 2); str = malloc(len += strlen(value) + 2);
snprintf(str, len, "%s=%s", name, value); snprintf(str, len, "%s=%s", name, value);
putenv(str); if (putenv(str))
rb_sys_fail("putenv");
} }
#else /* WIN32 */ #else /* WIN32 */
size_t len; size_t len;