diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 10:39:57 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 10:39:57 +0000 |
commit | 2b785b0f3e4f902e7de29a895d1f6ae0f10c3265 (patch) | |
tree | bc1801ecbd4d1e852a5ae0a0b8202a41c7ec933b /win32 | |
parent | 23a434b3630b05781dc48e07582ed180d9661a6a (diff) |
Merge changes from ruby_1_8 to reduce warnings and potentially improve
security.
* mkconfig.rb: hide build path from rbconfig.rb.
* util.c (ruby_strtod, dtoa): initialize more variables for error
handling.
* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
(path2class, path2module): constified.
* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
* suppress warnings on cygwin, mingw and mswin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.c | 28 | ||||
-rw-r--r-- | win32/win32.h | 6 |
2 files changed, 10 insertions, 24 deletions
diff --git a/win32/win32.c b/win32/win32.c index 22fa42a712..8b65360328 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -21,6 +21,7 @@ #include <stdlib.h> #include <errno.h> #include <assert.h> +#include <ctype.h> #include <windows.h> #include <winbase.h> @@ -208,7 +209,7 @@ rb_w32_map_errno(DWORD winerr) #define map_errno rb_w32_map_errno -static char *NTLoginName; +static const char *NTLoginName; #ifdef WIN95 static DWORD Win32System = (DWORD)-1; @@ -448,10 +449,6 @@ init_env(void) void NtInitialize(int *argc, char ***argv) { - - WORD version; - int ret; - #if _MSC_VER >= 1400 static void set_pioinfo_extra(void); @@ -490,7 +487,7 @@ NtInitialize(int *argc, char ***argv) char * getlogin() { - return NTLoginName; + return (char *)NTLoginName; } #define MAXCHILDNUM 256 /* max num of child processes */ @@ -506,15 +503,6 @@ static struct ChildRecord { #define END_FOREACH_CHILD } while (0) static struct ChildRecord * -FindFirstChildSlot(void) -{ - FOREACH_CHILD(child) { - if (child->pid) return child; - } END_FOREACH_CHILD; - return NULL; -} - -static struct ChildRecord * FindChildSlot(rb_pid_t pid) { @@ -665,7 +653,7 @@ rb_w32_get_osfhandle(int fh) } rb_pid_t -pipe_exec(char *cmd, int mode, FILE **fpr, FILE **fpw) +pipe_exec(const char *cmd, int mode, FILE **fpr, FILE **fpw) { struct ChildRecord* child; HANDLE hReadIn, hReadOut; @@ -804,7 +792,7 @@ pipe_exec(char *cmd, int mode, FILE **fpr, FILE **fpw) extern VALUE rb_last_status; int -do_spawn(int mode, char *cmd) +do_spawn(int mode, const char *cmd) { struct ChildRecord *child; DWORD exitcode; @@ -841,7 +829,7 @@ do_spawn(int mode, char *cmd) } int -do_aspawn(int mode, char *prog, char **argv) +do_aspawn(int mode, const char *prog, char **argv) { char *cmd, *p, *q, *s, **t; int len, n, bs, quote; @@ -1211,7 +1199,7 @@ skipspace(char *ptr) int rb_w32_cmdvector(const char *cmd, char ***vec) { - int cmdlen, globbing, len, i; + int globbing, len; int elements, strsz, done; int slashes, escape; char *ptr, *base, *buffer, *cmdline; @@ -3936,9 +3924,7 @@ int rb_w32_utime(const char *path, struct utimbuf *times) { HANDLE hFile; - SYSTEMTIME st; FILETIME atime, mtime; - struct tm *tm; struct stat stat; int ret = 0; diff --git a/win32/win32.h b/win32/win32.h index 4d97ee4d5c..b6ebab04ae 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -160,7 +160,7 @@ struct timezone { #endif extern void NtInitialize(int *, char ***); extern int rb_w32_cmdvector(const char *, char ***); -extern rb_pid_t pipe_exec(char *, int, FILE **, FILE **); +extern rb_pid_t pipe_exec(const char *, int, FILE **, FILE **); extern int flock(int fd, int oper); extern int rb_w32_accept(int, struct sockaddr *, int *); extern int rb_w32_bind(int, struct sockaddr *, int); @@ -206,8 +206,8 @@ extern int chown(const char *, int, int); extern int link(char *, char *); extern int gettimeofday(struct timeval *, struct timezone *); extern rb_pid_t waitpid (rb_pid_t, int *, int); -extern int do_spawn(int, char *); -extern int do_aspawn(int, char *, char **); +extern int do_spawn(int, const char *); +extern int do_aspawn(int, const char *, char **); extern int kill(int, int); extern int fcntl(int, int, ...); extern rb_pid_t rb_w32_getpid(void); |