[前][次][番号順一覧][スレッド一覧]

ruby-changes:14463

From: usa <ko1@a...>
Date: Tue, 12 Jan 2010 13:36:11 +0900 (JST)
Subject: [ruby-changes:14463] Ruby:r26295 (trunk): * file.c (realpath_rec): trace symbolic link only when supporting

usa	2010-01-12 13:35:53 +0900 (Tue, 12 Jan 2010)

  New Revision: 26295

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26295

  Log:
    * file.c (realpath_rec): trace symbolic link only when supporting
      readline().

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26294)
+++ ChangeLog	(revision 26295)
@@ -1,3 +1,8 @@
+Tue Jan 12 13:33:54 2010  NAKAMURA Usaku  <usa@r...>
+
+	* file.c (realpath_rec): trace symbolic link only when supporting
+	  readline().
+
 Tue Jan 12 12:49:39 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* misc/ruby-mode.el (ruby-here-doc-beg-match): fix for here-doc
Index: file.c
===================================================================
--- file.c	(revision 26294)
+++ file.c	(revision 26295)
@@ -3133,6 +3133,7 @@
                         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 @@
                     }
                     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;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]