diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-04-22 21:42:18 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-04-22 21:42:18 +0400 |
| commit | b12d6d10adaebe67ae488a7593e2288e4a756c2c (patch) | |
| tree | 5399b3e0f775aaa27a7a3c592fc0f67953806c41 /winsup | |
| parent | 6ff06a072611d796f40e03dd2af6abad582b341f (diff) | |
* path.cc (symlink_info::check): Make sure to restart only once.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 4965e98d4..ef716d747 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2010-04-22 Corinna Vinschen <corinna@vinschen.de> + * path.cc (symlink_info::check): Make sure to restart only once. + +2010-04-22 Corinna Vinschen <corinna@vinschen.de> + * mount.cc (GETVOLINFO_VALID_MASK): Drop FILE_SEQUENTIAL_WRITE_ONCE from mask. Expand the comment a bit. (WIN_FAT_FLAGS): New define. 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; } } |