From b12d6d10adaebe67ae488a7593e2288e4a756c2c Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 Apr 2010 17:42:18 +0000 Subject: [PATCH] * path.cc (symlink_info::check): Make sure to restart only once. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/path.cc | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 4965e98d4..ef716d747 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2010-04-22 Corinna Vinschen + + * path.cc (symlink_info::check): Make sure to restart only once. + 2010-04-22 Corinna Vinschen * mount.cc (GETVOLINFO_VALID_MASK): Drop FILE_SEQUENTIAL_WRITE_ONCE diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 3163f9e61..fd9c3a01a 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -2189,6 +2189,7 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt, /* This label is used in case we encounter a FS which only handles DOS paths. See below. */ + bool restarted = false; restart: h = NULL; @@ -2294,7 +2295,7 @@ restart: we encountered a STATUS_OBJECT_NAME_NOT_FOUND *and* we didn't already attach a suffix *and* the above special case for UDF on XP didn't succeeed. */ - if (!*ext_here && !fs_update_called) + if (!restarted && !*ext_here && !fs_update_called) { /* Check for leading space or trailing dot or space in last component. */ @@ -2317,6 +2318,7 @@ restart: memmove (pbeg, pbeg + 1, --pend - pbeg); *pend = '\0'; /* ...try again. */ + restarted = true; goto restart; } }