diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | dln.c | 6 | ||||
-rw-r--r-- | ext/-test-/load/dot.dot/dot.dot.c | 1 | ||||
-rw-r--r-- | ext/-test-/load/dot.dot/extconf.rb | 1 | ||||
-rw-r--r-- | test/-ext-/load/test_dot_dot.rb | 10 |
5 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Thu Jan 6 05:03:26 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * dln.c (init_funcname_len): ignore rest from first dot. + [ruby-dev:41774] + Thu Jan 6 02:55:48 2011 Aaron Patterson <aaron@tenderlovemaking.com> * ext/psych/lib/psych/visitors/yaml_tree.rb: use YAML 1.0 output @@ -126,12 +126,12 @@ init_funcname_len(const char **file) /* Load the file as an object one */ for (base = p; *p; p++) { /* Find position of last '/' */ - if (*p == '.') dot = p; - if (isdirsep(*p)) base = p+1; + if (*p == '.' && !dot) dot = p; + if (isdirsep(*p)) base = p+1, dot = NULL; } *file = base; /* Delete suffix if it exists */ - return (dot && dot > base ? dot : p) - base; + return (dot ? dot : p) - base; } static const char funcname_prefix[sizeof(FUNCNAME_PREFIX) - 1] = FUNCNAME_PREFIX; diff --git a/ext/-test-/load/dot.dot/dot.dot.c b/ext/-test-/load/dot.dot/dot.dot.c new file mode 100644 index 0000000000..936d28931a --- /dev/null +++ b/ext/-test-/load/dot.dot/dot.dot.c @@ -0,0 +1 @@ +void Init_dot(void) {} diff --git a/ext/-test-/load/dot.dot/extconf.rb b/ext/-test-/load/dot.dot/extconf.rb new file mode 100644 index 0000000000..6287db6bd8 --- /dev/null +++ b/ext/-test-/load/dot.dot/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/load/dot.dot/dot.dot") diff --git a/test/-ext-/load/test_dot_dot.rb b/test/-ext-/load/test_dot_dot.rb new file mode 100644 index 0000000000..82aa10a95f --- /dev/null +++ b/test/-ext-/load/test_dot_dot.rb @@ -0,0 +1,10 @@ +require 'test/unit' + +class Test_DotDot < Test::Unit::TestCase + def test_load_dot_dot + feature = '[ruby-dev:41774]' + assert_nothing_raised(LoadError, feature) { + require '-test-/load/dot.dot/dot.dot' + } + end +end |