kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* hash.c (ruby_setenv): check env process block size with OS ver. 

* win32/win32.c: export rb_w32_osver for above patch.
* include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31132 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
arton 2011-03-19 16:33:59 +00:00
parent bdc8f4fca9
commit 11e4052295
4 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Mar 20 01:39:48 2011 Tajima Akio <artonx@yahoo.co.jp>
* hash.c (ruby_setenv): check env process block size with OS ver.
* win32/win32.c: export rb_w32_osver for above patch.
* include/ruby/win32.h: declare rb_w32_osver for Win32 Libs.
Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp>
* hash.c (ruby_setenv): calculate total env block size for win32.
@ -6,7 +12,7 @@ Sat Mar 19 18:35:05 2011 Tajima Akio <artonx@yahoo.co.jp>
Sat Mar 19 17:14:46 2011 Tajima Akio <artonx@yahoo.co.jp>
* hash.c (ruby_setenv): checking with max process environment
block size fow Win32. 32767 for 2000/XP, 2003. if failed to
block size for Win32. 32767 for 2000/XP, 2003. if failed to
read the block, then checking with 5120 for earlier Windows.
Sat Mar 19 12:30:25 2011 Tanaka Akira <akr@fsij.org>

22
hash.c
View File

@ -2195,13 +2195,18 @@ envix(const char *nam)
#endif
#if defined(_WIN32)
static int
getenvsize(char* p)
static size_t
getenvsize(const char* p)
{
char* porg = p;
while (*p || *(p + 1)) ++p;
const char* porg = p;
while (*p++) p += strlen(p) + 1;
return p - porg + 1;
}
static size_t
getenvblocksize()
{
return (rb_w32_osver() >= 5) ? 32767 : 5120;
}
#endif
void
@ -2216,11 +2221,10 @@ ruby_setenv(const char *name, const char *value)
rb_sys_fail("ruby_setenv");
}
if (value) {
char* p = GetEnvironmentStringsA();
if (p) {
if (strlen(name) + 1 + strlen(value) + getenvsize(p) >= 32767) goto fail;
} else {
if (strlen(value) >= 5120) goto fail;
const char* p = GetEnvironmentStringsA();
if (!p) goto fail; /* never happen */
if (strlen(name) + 2 + strlen(value) + getenvsize(p) >= getenvblocksize()) {
goto fail; /* 2 for '=' & '\0' */
}
buf = rb_sprintf("%s=%s", name, value);
}

1
include/ruby/win32.h
View File

@ -271,6 +271,7 @@ extern char **rb_w32_get_environ(void);
extern void rb_w32_free_environ(char **);
extern int rb_w32_map_errno(DWORD);
extern char * WSAAPI rb_w32_inet_ntop(int,void *,char *,size_t);
extern DWORD rb_w32_osver(void);
extern int chown(const char *, int, int);
extern int rb_w32_uchown(const char *, int, int);

2
win32/win32.c
View File

@ -252,7 +252,7 @@ rb_w32_osid(void)
}
#endif
static DWORD
DWORD
rb_w32_osver(void)
{
return osver.dwMajorVersion;