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

* ruby.c (get_arglen): skip the last terminator of argv before

Browse Source 
checking environ.

* ruby.c (get_arglen): duplicate environ area if setenv and unsetenv
  are provided.

* ruby.c (set_arg0): keep empty strings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27468 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-04-24 04:06:59 +00:00
parent 07311e56e2
commit 655b2ade49
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sat Apr 24 13:06:57 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (get_arglen): skip the last terminator of argv before
checking environ.
* ruby.c (get_arglen): duplicate environ area if setenv and unsetenv
are provided.
* ruby.c (set_arg0): keep empty strings.
Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Apr 24 09:44:40 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/syck/yaml2byte.c (bytestring_append, bytestring_extend): * ext/syck/yaml2byte.c (bytestring_append, bytestring_extend):

23
ruby.c
View File

@ -1642,7 +1642,7 @@ rb_load_file(const char *fname)
} }
#if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE) #if !defined(PSTAT_SETCMD) && !defined(HAVE_SETPROCTITLE)
#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV)) #if !defined(_WIN32)
#define USE_ENVSPACE_FOR_ARG0 #define USE_ENVSPACE_FOR_ARG0
#endif #endif
@ -1669,7 +1669,8 @@ get_arglen(int argc, char **argv)
} }
} }
#if defined(USE_ENVSPACE_FOR_ARG0) #if defined(USE_ENVSPACE_FOR_ARG0)
if (environ && (s == environ[0])) { if (environ && (s+1 == environ[0])) {
s++;
s += strlen(s); s += strlen(s);
for (i = 1; environ[i]; i++) { for (i = 1; environ[i]; i++) {
if (environ[i] == s + 1) { if (environ[i] == s + 1) {
@ -1677,7 +1678,19 @@ get_arglen(int argc, char **argv)
s += strlen(s); /* this one is ok too */ s += strlen(s); /* this one is ok too */
} }
} }
# if defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
{
char *t = malloc(s - environ[0] + 1);
for (i = 0; environ[i]; i++) {
size_t len = strlen(environ[i]) + 1;
memcpy(t, environ[i], len);
environ[i] = t;
t += len;
}
}
# else
ruby_setenv("", NULL); /* duplicate environ vars */ ruby_setenv("", NULL); /* duplicate environ vars */
# endif
} }
#endif #endif
return s - argv[0]; return s - argv[0];
@ -1712,8 +1725,8 @@ set_arg0(VALUE val, ID id)
setproctitle("%.*s", (int)i, s); setproctitle("%.*s", (int)i, s);
#else #else
if ((size_t)i >= origarg.len) { if ((size_t)i > origarg.len - origarg.argc) {
i = (long)(origarg.len - 1); i = (long)(origarg.len - origarg.argc);
} }
memcpy(origarg.argv[0], s, i); memcpy(origarg.argv[0], s, i);
@ -1724,7 +1737,7 @@ set_arg0(VALUE val, ID id)
*t = '\0'; *t = '\0';
if ((size_t)(i + 1) < origarg.len) { if ((size_t)(i + 1) < origarg.len) {
memset(t + 1, ' ', origarg.len - i - 1); memset(t + 1, '\0', origarg.len - i - 1);
} }
for (j = 1; j < origarg.argc; j++) { for (j = 1; j < origarg.argc; j++) {
origarg.argv[j] = t; origarg.argv[j] = t;