summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_disk_file.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2008-03-12 16:07:04 +0000
committerCorinna Vinschen <corinna@vinschen.de>2008-03-12 16:07:04 +0000
commitb0717aae021d618cc281ad0343ac474d6e0d8f38 (patch)
treefd203db108ebb7b62edd1f9abd8f48e0a36952fb /winsup/cygwin/fhandler_disk_file.cc
parent31812fc0bce3afa55f2e4f70411d849dac41e1aa (diff)
downloadcygnal-b0717aae021d618cc281ad0343ac474d6e0d8f38.tar.gz
cygnal-b0717aae021d618cc281ad0343ac474d6e0d8f38.tar.bz2
cygnal-b0717aae021d618cc281ad0343ac474d6e0d8f38.zip
* fhandler_disk_file.cc (fhandler_disk_file::readdir_helper): Disable
munging. Convert all chars in the 0xf0xx area to it's ascii equivalent. * path.cc (normalize_posix_path): Don't treat "X:foo" as windows path, only "a:\foo". (tfx_chars): New transformation table for special DOS chars. (tfx_chars_managed): Ditto, plus transformation of uppercase ASCII chars. (transform_chars): New function. (get_nt_native_path): Make static. Call transform_chars for all valid FS paths. Get additional flag if file is managed or not. Accommodate throughout. (getfileattr): Get additional flag if file is managed or not. Accommodate throughout. (path_conv::check): Disable special handling for trailing dots and spaces. (mount_item::build_win32): Disable code for managed paths. (mount_info::conv_to_posix_path): Ditto. * path.h (get_nt_native_path): Remove declaration.
Diffstat (limited to 'winsup/cygwin/fhandler_disk_file.cc')
-rw-r--r--winsup/cygwin/fhandler_disk_file.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc
index 061f6ea9a..54a0f93c8 100644
--- a/winsup/cygwin/fhandler_disk_file.cc
+++ b/winsup/cygwin/fhandler_disk_file.cc
@@ -1785,6 +1785,11 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
}
}
+ /* Transform special DOS chars back to normal. */
+ for (USHORT i = 0; i < fname->Length / sizeof (WCHAR); ++i)
+ if ((fname->Buffer[i] & 0xff00) == 0xf000)
+ fname->Buffer[i] &= 0xff;
+#if 0
if (pc.isencoded ())
{
char tmp[NAME_MAX + 1];
@@ -1793,6 +1798,7 @@ fhandler_disk_file::readdir_helper (DIR *dir, dirent *de, DWORD w32_err,
fnunmunge (de->d_name, tmp);
}
else
+#endif
sys_wcstombs (de->d_name, NAME_MAX + 1, fname->Buffer,
fname->Length / sizeof (WCHAR));