From 840a5b482aa275f1664e637ffcd4768fe20af7b8 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 13:24:05 +0000 Subject: merge revision(s) 16177: * dln.c (dln_find_1): prior files with extensions to files sans extensions. [ruby-core:16517] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17260 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ dln.c | 41 +++++++++++++++++++++-------------------- version.h | 2 +- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index cb277e1801..c1b2e96f37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Jun 15 22:21:07 2008 Nobuyoshi Nakada + + * dln.c (dln_find_1): prior files with extensions to files sans + extensions. [ruby-core:16517] + Sun Jun 15 22:19:33 2008 Yukihiro Matsumoto * sprintf.c (rb_f_sprintf): should protect temporary string from diff --git a/dln.c b/dln.c index fd59bdab8e..f665ce4712 100644 --- a/dln.c +++ b/dln.c @@ -1772,26 +1772,9 @@ dln_find_1(fname, path, exe_flag) } memcpy(bp, fname, i + 1); -#ifndef __MACOS__ - if (stat(fbuf, &st) == 0) { - if (exe_flag == 0) return fbuf; - /* looking for executable */ - if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0) - return fbuf; - } -#else - if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) { - if (exe_flag == 0) return mac_fullpath; - /* looking for executable */ - if (stat(mac_fullpath, &st) == 0) { - if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0) - return mac_fullpath; - } - } -#endif #if defined(DOSISH) if (exe_flag) { - static const char *extension[] = { + static const char extension[][5] = { #if defined(MSDOS) ".com", ".exe", ".bat", #if defined(DJGPP) @@ -1804,11 +1787,10 @@ dln_find_1(fname, path, exe_flag) ".r", ".R", ".x", ".X", ".bat", ".BAT", /* __human68k__ */ #endif - (char *) NULL }; int j; - for (j = 0; extension[j]; j++) { + for (j = 0; j < sizeof(extension) / sizeof(extension[0]); j++) { if (fspace < strlen(extension[j])) { fprintf(stderr, "openpath: pathname too long (ignored)\n"); fprintf(stderr, "\tDirectory \"%.*s\"\n", (int) (bp - fbuf), fbuf); @@ -1825,9 +1807,28 @@ dln_find_1(fname, path, exe_flag) #endif } + goto next; } #endif /* MSDOS or _WIN32 or __human68k__ or __EMX__ */ +#ifndef __MACOS__ + if (stat(fbuf, &st) == 0) { + if (exe_flag == 0) return fbuf; + /* looking for executable */ + if (!S_ISDIR(st.st_mode) && eaccess(fbuf, X_OK) == 0) + return fbuf; + } +#else + if (mac_fullpath = _macruby_exist_file_in_libdir_as_posix_name(fbuf)) { + if (exe_flag == 0) return mac_fullpath; + /* looking for executable */ + if (stat(mac_fullpath, &st) == 0) { + if (!S_ISDIR(st.st_mode) && eaccess(mac_fullpath, X_OK) == 0) + return mac_fullpath; + } + } +#endif + next: /* if not, and no other alternatives, life is bleak */ if (*ep == '\0') { diff --git a/version.h b/version.h index 586c9a5bd1..4b37c7a3fd 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 198 +#define RUBY_PATCHLEVEL 199 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3