diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | file.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Tue Nov 22 01:45:21 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * file.c (rb_file_s_basename): DOSISH_UNC is defined on cygwin but + DOSISH is not. fixed: [ruby-dev:27797] + Mon Nov 21 22:50:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * file.c (rb_path_skip_prefix, rb_file_s_basename): UNC without path @@ -2634,7 +2634,7 @@ rb_file_s_basename(argc, argv) { VALUE fname, fext, basename; char *name, *p; -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC char *root; #endif int f; @@ -2646,7 +2646,7 @@ rb_file_s_basename(argc, argv) if (RSTRING(fname)->len == 0 || !*(name = RSTRING(fname)->ptr)) return fname; name = skipprefix(name); -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC root = name; #endif while (isdirsep(*name)) @@ -2654,7 +2654,7 @@ rb_file_s_basename(argc, argv) if (!*name) { p = name - 1; f = 1; -#ifdef DOSISH +#if defined DOSISH_DRIVE_LETTER || defined DOSISH_UNC if (name != root) { /* has slashes */ } |