From 04351d95585db8baee7cbcf0cf6939cb3cbeaf6c Mon Sep 17 00:00:00 2001 From: nobu Date: Sat, 17 May 2008 14:54:07 +0000 Subject: * file.c (file_expand_path): fix for short file name on Cygwin. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16450 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ file.c | 12 ++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 72718f21c4..c8388a2c8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Sat May 17 23:53:57 2008 Nobuyoshi Nakada + + * file.c (file_expand_path): fix for short file name on Cygwin. + Sat May 17 18:03:52 2008 Yuki Sonoda (Yugui) * vm.c (Init_VM): removed the definition of Thread#initialize, diff --git a/file.c b/file.c index 1f7b207195..e695582d04 100644 --- a/file.c +++ b/file.c @@ -2827,15 +2827,20 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result) #if USE_NTFS *p = '\0'; - if (!strpbrk(b = buf, "*?")) { + if (1 && +#ifdef __CYGWIN__ + !(buf[0] == '/' && !buf[1]) && +#endif + !strpbrk(b = buf, "*?")) { size_t len; WIN32_FIND_DATA wfd; #ifdef __CYGWIN__ - int lnk_added = 0; + int lnk_added = 0, is_symlink = 0; struct stat st; char w32buf[MAXPATHLEN], sep = 0; p = 0; if (lstat(buf, &st) == 0 && S_ISLNK(st.st_mode)) { + is_symlink = 1; p = strrdirsep(buf); if (!p) p = skipprefix(buf); if (p) { @@ -2848,8 +2853,7 @@ file_expand_path(VALUE fname, VALUE dname, VALUE result) } if (p) *p = sep; else p = buf; - if (b == w32buf) { - strlcat(w32buf, p, sizeof(w32buf)); + if (is_symlink && b == w32buf) { len = strlen(p); if (len > 4 && STRCASECMP(p + len - 4, ".lnk") != 0) { lnk_added = 1; -- cgit v1.2.3