aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--file.c16
-rw-r--r--version.h4
3 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 57b059aeaa..552fafaad0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun May 31 23:26:36 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * file.c (istrailinggarbage): fixed typo.
+
Fri May 29 17:10:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* struct.c (Init_Struct): made #to_s an alias to #inspect to
diff --git a/file.c b/file.c
index 4b67b02171..5593cad320 100644
--- a/file.c
+++ b/file.c
@@ -2465,9 +2465,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. */
@@ -2608,9 +2608,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)) {
@@ -2829,7 +2829,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;
@@ -2849,7 +2849,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;
@@ -3221,10 +3221,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++;
}
diff --git a/version.h b/version.h
index 761bc7ce32..b535dba5c4 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-05-29"
+#define RUBY_RELEASE_DATE "2009-05-31"
#define RUBY_PATCHLEVEL -1
#define RUBY_BRANCH_NAME "trunk"
@@ -8,7 +8,7 @@
#define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 31
#include "ruby/version.h"