diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | file.c | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Tue Jan 12 13:33:54 2010 NAKAMURA Usaku <usa@ruby-lang.org> + + * file.c (realpath_rec): trace symbolic link only when supporting + readline(). + Tue Jan 12 12:49:39 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc @@ -3133,6 +3133,7 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopche rb_sys_fail(RSTRING_PTR(testpath)); } } +#ifdef HAVE_READLINK if (S_ISLNK(sbuf.st_mode)) { volatile VALUE link; char *link_prefix, *link_names; @@ -3152,7 +3153,9 @@ realpath_rec(long *prefixlenp, VALUE *resolvedp, char *unresolved, VALUE loopche } rb_hash_aset(loopcheck, testpath, rb_str_dup_frozen(*resolvedp)); } - else { + else +#endif + { VALUE s = rb_str_dup_frozen(testpath); rb_hash_aset(loopcheck, s, s); *resolvedp = testpath; |