diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-12 06:06:15 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-12 06:06:15 +0000 |
commit | 54c24dfc99bdf5186d813a4673e28ac93504f350 (patch) | |
tree | 87242631d7db7db7b90661c4e82005bb08ffcb39 /win32 | |
parent | 2b2c7c36d18919fd2e948fac0f4faf57e681a62c (diff) |
* eval.c (ruby_options): now we cannot call rb_glob() before
ruby_init(), so call rb_w32_cmdvector() at ruby_options().
* win32.{c,h} (rb_w32_cmdvector): rename make_cmdvector() and
export it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7254 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.c | 15 | ||||
-rw-r--r-- | win32/win32.h | 4 |
2 files changed, 3 insertions, 16 deletions
diff --git a/win32/win32.c b/win32/win32.c index 2bd7682a79..9fffcb7b47 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -89,7 +89,6 @@ bool NtSyncProcess = TRUE; static struct ChildRecord *CreateChild(char *, char *, SECURITY_ATTRIBUTES *, HANDLE, HANDLE, HANDLE); -static int make_cmdvector(const char *, char ***); static bool has_redirection(const char *); static void StartSockets (); static DWORD wait_events(HANDLE event, DWORD timeout); @@ -368,11 +367,6 @@ NtInitialize(int *argc, char ***argv) #endif // - // subvert cmd.exe's feeble attempt at command line parsing - // - *argc = make_cmdvector(GetCommandLine(), argv); - - // // Now set up the correct time stuff // @@ -380,11 +374,6 @@ NtInitialize(int *argc, char ***argv) // Initialize Winsock StartSockets(); - -#ifdef _WIN32_WCE - // free commandline buffer - wce_FreeCommandLine(); -#endif } char *getlogin() @@ -1098,8 +1087,8 @@ skipspace(char *ptr) return ptr; } -static int -make_cmdvector(const char *cmd, char ***vec) +int +rb_w32_cmdvector(const char *cmd, char ***vec) { int cmdlen, globbing, len, i; int elements, strsz, done; diff --git a/win32/win32.h b/win32/win32.h index 60f9e3ddbd..d7222fc1b1 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -132,10 +132,8 @@ struct timezone { int tz_dsttime; }; #endif -extern int NtMakeCmdVector(char *, char ***, int); extern void NtInitialize(int *, char ***); -extern char * NtGetLib(void); -extern char * NtGetBin(void); +extern int rb_w32_cmdvector(const char *, char ***); extern pid_t pipe_exec(char *, int, FILE **, FILE **); extern int flock(int fd, int oper); extern int rb_w32_accept(int, struct sockaddr *, int *); |