diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:07:43 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:07:43 +0000 |
commit | 5784b103078be234267e001a3810e853389fcc6e (patch) | |
tree | a85b9e634246f12992a10727a1381b44b2beacbc /file.c | |
parent | 6344190e612c725a786d8429d55b730f2b98fb1c (diff) |
merges r23607 from trunk into ruby_1_9_1.
--
* file.c (istrailinggarbage): fixed typo.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r-- | file.c | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -2410,9 +2410,9 @@ rb_file_s_umask(int argc, VALUE *argv) #endif #if USE_NTFS -#define istrailinggabage(x) ((x) == '.' || (x) == ' ') +#define istrailinggarbage(x) ((x) == '.' || (x) == ' ') #else -#define istrailinggabage(x) 0 +#define istrailinggarbage(x) 0 #endif #ifndef CharNext /* defined as CharNext[AW] on Windows. */ @@ -2553,9 +2553,9 @@ ntfs_tail(const char *path) { while (*path == '.') path++; while (*path && *path != ':') { - if (istrailinggabage(*path)) { + if (istrailinggarbage(*path)) { const char *last = path++; - while (istrailinggabage(*path)) path++; + while (istrailinggarbage(*path)) path++; if (!*path || *path == ':') return (char *)last; } else if (isdirsep(*path)) { @@ -2759,7 +2759,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) } #if USE_NTFS else { - do *++s; while (istrailinggabage(*s)); + do ++s; while (istrailinggarbage(*s)); } #endif break; @@ -2779,7 +2779,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result) --s; case ' ': { const char *e = s; - while (istrailinggabage(*s)) s++; + while (istrailinggarbage(*s)) s++; if (!*s) { s = e; goto endpath; @@ -3145,10 +3145,10 @@ rb_file_s_extname(VALUE klass, VALUE fname) e = 0; while (*p && *p == '.') p++; while (*p) { - if (*p == '.' || istrailinggabage(*p)) { + if (*p == '.' || istrailinggarbage(*p)) { #if USE_NTFS const char *last = p++, *dot = last; - while (istrailinggabage(*p)) { + while (istrailinggarbage(*p)) { if (*p == '.') dot = p; p++; } |