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 /dln.c | |
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 'dln.c')
-rw-r--r-- | dln.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -1689,31 +1689,31 @@ static char fbuf[MAXPATHLEN]; static char * dln_find_1(fname, path, exe_flag) - char *fname; - char *path; + const char *fname; + const char *path; int exe_flag; /* non 0 if looking for executable. */ { - register char *dp; - register char *ep; + register const char *dp; + register const char *ep; register char *bp; struct stat st; #ifdef __MACOS__ const char* mac_fullpath; #endif - if (!fname) return fname; - if (fname[0] == '/') return fname; + if (!fname) return (char *)fname; + if (fname[0] == '/') return (char *)fname; if (strncmp("./", fname, 2) == 0 || strncmp("../", fname, 3) == 0) - return fname; - if (exe_flag && strchr(fname, '/')) return fname; + return (char *)fname; + if (exe_flag && strchr(fname, '/')) return (char *)fname; #ifdef DOSISH - if (fname[0] == '\\') return fname; + if (fname[0] == '\\') return (char *)fname; # ifdef DOSISH_DRIVE_LETTER - if (strlen(fname) > 2 && fname[1] == ':') return fname; + if (strlen(fname) > 2 && fname[1] == ':') return (char *)fname; # endif if (strncmp(".\\", fname, 2) == 0 || strncmp("..\\", fname, 3) == 0) - return fname; - if (exe_flag && strchr(fname, '\\')) return fname; + return (char *)fname; + if (exe_flag && strchr(fname, '\\')) return (char *)fname; #endif for (dp = path;; dp = ++ep) { |