diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | win32/win32.c | 38 |
2 files changed, 16 insertions, 27 deletions
@@ -1,4 +1,7 @@ -Sun Jun 30 10:58:53 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 30 10:58:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (w32_getenv): extract codepage aware code from + rb_w32_ugetenv() and rb_w32_getenv(). * win32/win32.c (w32_stati64): extract codepage aware code from rb_w32_ustati64() and rb_w32_stati64(). diff --git a/win32/win32.c b/win32/win32.c index 6a69a97092..12b0678841 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -50,6 +50,7 @@ #define isdirsep(x) ((x) == '/' || (x) == '\\') static int w32_stati64(const char *path, struct stati64 *st, UINT cp); +static char *w32_getenv(const char *name, UINT cp); #undef stat #undef fclose @@ -4448,8 +4449,8 @@ wait(int *status) } /* License: Ruby's */ -char * -rb_w32_ugetenv(const char *name) +static char * +w32_getenv(const char *name, UINT cp) { WCHAR *wenvarea, *wenv; int len = strlen(name); @@ -4473,7 +4474,7 @@ rb_w32_ugetenv(const char *name) } for (wenv = wenvarea, wlen = 1; *wenv; wenv += lstrlenW(wenv) + 1) wlen += lstrlenW(wenv) + 1; - uenvarea = wstr_to_mbstr(CP_UTF8, wenvarea, wlen, NULL); + uenvarea = wstr_to_mbstr(cp, wenvarea, wlen, NULL); FreeEnvironmentStringsW(wenvarea); if (!uenvarea) return NULL; @@ -4487,31 +4488,16 @@ rb_w32_ugetenv(const char *name) /* License: Ruby's */ char * -rb_w32_getenv(const char *name) +rb_w32_ugetenv(const char *name) { - int len = strlen(name); - char *env; - - if (len == 0) return NULL; - if (uenvarea) { - free(uenvarea); - uenvarea = NULL; - } - if (envarea) { - FreeEnvironmentStrings(envarea); - envarea = NULL; - } - envarea = GetEnvironmentStrings(); - if (!envarea) { - map_errno(GetLastError()); - return NULL; - } - - for (env = envarea; *env; env += strlen(env) + 1) - if (strncasecmp(env, name, len) == 0 && *(env + len) == '=') - return env + len + 1; + return w32_getenv(name, CP_UTF8); +} - return NULL; +/* License: Ruby's */ +char * +rb_w32_getenv(const char *name) +{ + return w32_getenv(name, CP_ACP); } /* License: Artistic or GPL */ |