diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2010-05-06 10:04:50 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2010-05-06 10:04:50 +0000 |
| commit | 35c0485d2d2c8ee34ad5a84fad153b9c3c565210 (patch) | |
| tree | a49c168f47ec7d2dafe87f6ead71bc53a4e81b2a /winsup | |
| parent | 73bcd49b1f0f02cad25ebf8b14d549983697a571 (diff) | |
| download | cygnal-35c0485d2d2c8ee34ad5a84fad153b9c3c565210.tar.gz cygnal-35c0485d2d2c8ee34ad5a84fad153b9c3c565210.tar.bz2 cygnal-35c0485d2d2c8ee34ad5a84fad153b9c3c565210.zip | |
* path.cc (path_conv::check): Drop setting sym.pflags before calling
mount_info::conv_to_win32_path since the flag value is overwritten by
mount_info::conv_to_win32_path anyway.
Set flags for DOS paths before calling symlink_info::check so they can
be used in that function already.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 8 | ||||
| -rw-r--r-- | winsup/cygwin/path.cc | 13 |
2 files changed, 15 insertions, 6 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index e5fbc9e9d..abaf716be 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,11 @@ +2010-05-06 Corinna Vinschen <corinna@vinschen.de> + + * path.cc (path_conv::check): Drop setting sym.pflags before calling + mount_info::conv_to_win32_path since the flag value is overwritten by + mount_info::conv_to_win32_path anyway. + Set flags for DOS paths before calling symlink_info::check so they can + be used in that function already. + 2010-05-03 Christopher Faylor <me+cygwin@cgf.cx> * dll_init.cc (dll_list::alloc): Add debugging assertion. diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc index 7782e4027..72704480d 100644 --- a/winsup/cygwin/path.cc +++ b/winsup/cygwin/path.cc @@ -705,13 +705,11 @@ path_conv::check (const char *src, unsigned opt, if (component) { suff = NULL; - sym.pflags = 0; full_path = pathbuf; } else { suff = suffixes; - sym.pflags = path_flags; full_path = THIS_path; } @@ -818,6 +816,13 @@ path_conv::check (const char *src, unsigned opt, full_path[3] = '\0'; } + /* If the incoming path was given in DOS notation, always treat + it as caseinsensitive,noacl path. This must be set before + calling sym.check, otherwise the path is potentially treated + casesensitive. */ + if (is_msdos) + sym.pflags |= PATH_NOPOSIX | PATH_NOACL; + symlen = sym.check (full_path, suff, opt, fs); is_virtual_symlink: @@ -856,10 +861,6 @@ is_virtual_symlink: don't handle path casesensitive. */ if (cygwin_shared->obcaseinsensitive || fs.caseinsensitive ()) path_flags |= PATH_NOPOSIX; - /* If the incoming path was given in DOS notation, always treat - it as caseinsensitive,noacl path. */ - else if (is_msdos) - path_flags |= PATH_NOPOSIX | PATH_NOACL; caseinsensitive = (path_flags & PATH_NOPOSIX) ? OBJ_CASE_INSENSITIVE : 0; } |