diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-30 01:59:03 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-06-30 01:59:03 +0000 |
| commit | 64d39448d3ece0367a8ed2b94fd72b91895c34b6 (patch) | |
| tree | 2ef3fdf379dbef6923acea689e1f8b82bdb0771d | |
| parent | a65261c2c19993f1fb519deef16eff11f790c27a (diff) | |
win32.c: UTF-8 aspawn
* win32/win32.c (w32_aspawn_flags): extract codepage aware code from
rb_w32_aspawn_flags().
* win32/win32.c (rb_w32_uaspawn_flags, rb_w32_uaspawn_flags): add
UTF-8 version functions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/ruby/win32.h | 2 | ||||
| -rw-r--r-- | win32/win32.c | 30 |
3 files changed, 35 insertions, 5 deletions
@@ -1,4 +1,10 @@ -Sun Jun 30 10:58:57 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Sun Jun 30 10:59:00 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * win32/win32.c (w32_aspawn_flags): extract codepage aware code from + rb_w32_aspawn_flags(). + + * win32/win32.c (rb_w32_uaspawn_flags, rb_w32_uaspawn_flags): add + UTF-8 version functions. * win32/win32.c (w32_getenv): extract codepage aware code from rb_w32_ugetenv() and rb_w32_getenv(). diff --git a/include/ruby/win32.h b/include/ruby/win32.h index ad43dfc81f..234f4df385 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -316,6 +316,8 @@ extern rb_pid_t waitpid (rb_pid_t, int *, int); extern rb_pid_t rb_w32_spawn(int, const char *, const char*); extern rb_pid_t rb_w32_aspawn(int, const char *, char *const *); extern rb_pid_t rb_w32_aspawn_flags(int, const char *, char *const *, DWORD); +extern rb_pid_t rb_w32_uaspawn(int, const char *, char *const *); +extern rb_pid_t rb_w32_uaspawn_flags(int, const char *, char *const *, DWORD); extern int kill(int, int); extern int fcntl(int, int, ...); extern rb_pid_t rb_w32_getpid(void); diff --git a/win32/win32.c b/win32/win32.c index 12b0678841..b1780c2be1 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -1287,7 +1287,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog) /* License: Artistic or GPL */ rb_pid_t -rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags) +w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags, UINT cp) { int c_switch = 0; size_t len; @@ -1342,10 +1342,9 @@ rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags) join_argv(cmd, argv, FALSE); } - /* assume ACP */ - if (!e && cmd && !(wcmd = acp_to_wstr(cmd, NULL))) e = E2BIG; + if (!e && cmd && !(wcmd = mbstr_to_wstr(cp, cmd, -1, NULL))) e = E2BIG; if (v) ALLOCV_END(v); - if (!e && prog && !(wprog = acp_to_wstr(prog, NULL))) e = E2BIG; + if (!e && prog && !(wprog = mbstr_to_wstr(cp, prog, -1, NULL))) e = E2BIG; if (!e) { ret = child_result(CreateChild(wcmd, wprog, NULL, NULL, NULL, NULL, flags), mode); @@ -1356,12 +1355,35 @@ rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags) return ret; } +/* License: Ruby's */ +rb_pid_t +rb_w32_aspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags) +{ + /* assume ACP */ + return w32_aspawn_flags(mode, prog, argv, flags, filecp()); +} + +/* License: Ruby's */ +rb_pid_t +rb_w32_uaspawn_flags(int mode, const char *prog, char *const *argv, DWORD flags) +{ + return w32_aspawn_flags(mode, prog, argv, flags, CP_UTF8); +} + +/* License: Ruby's */ rb_pid_t rb_w32_aspawn(int mode, const char *prog, char *const *argv) { return rb_w32_aspawn_flags(mode, prog, argv, 0); } +/* License: Ruby's */ +rb_pid_t +rb_w32_uaspawn(int mode, const char *prog, char *const *argv) +{ + return rb_w32_uaspawn_flags(mode, prog, argv, 0); +} + /* License: Artistic or GPL */ typedef struct _NtCmdLineElement { struct _NtCmdLineElement *next; |