From c5a4eacc6902e3a09e1074570fb1642974436fab Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Thu, 22 Feb 2001 14:51:16 +0000 Subject: * cygerrno.h: Revert previous patch. * errno.cc: Ditto. * dir.cc: Eliminate `dir_suffixes'. (opendir): Remove usage of `dir_suffixes'. (rmdir): Ditto. * fhandler.cc (fhandler_disk_file::open): Remove usage of `inner_suffixes'. * path.cc: Rename `inner_suffixes' to `lnk_suffixes'. (path_conv::check): Remove usage of `inner_suffixes'. (symlink): Ditto. (symlink_info::check): Handle checking for `.lnk' in path_conv exclusively here. (chdir): Remove usage of `dir_suffixes'. * shortcut.c: Eliminate debug_printf lines. (check_shortcut): Don't set error except on failing ReadFile. * spawn.cc: Remove ".lnk" from `std_suffixes'. * syscalls.cc (_unlink): Remove usage of `inner_suffixes'. Remove ".lnk" from `stat_suffixes'. (_rename): Add check for renaming a symlink to keep the ".lnk" suffix after renaming. --- winsup/cygwin/dir.cc | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'winsup/cygwin/dir.cc') diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc index bad88c846..c88fbfc57 100644 --- a/winsup/cygwin/dir.cc +++ b/winsup/cygwin/dir.cc @@ -59,13 +59,6 @@ writable_directory (const char *file) #endif } -suffix_info dir_suffixes[] = -{ - suffix_info ("", 1), - suffix_info (".lnk", 1), - suffix_info (NULL) -}; - /* opendir: POSIX 5.1.2.1 */ extern "C" DIR * opendir (const char *dirname) @@ -75,7 +68,7 @@ opendir (const char *dirname) DIR *res = 0; struct stat statbuf; - path_conv real_dirname (dirname, PC_SYM_FOLLOW | PC_FULL, dir_suffixes); + path_conv real_dirname (dirname, PC_SYM_FOLLOW | PC_FULL); if (real_dirname.error) { @@ -331,7 +324,7 @@ rmdir (const char *dir) { int res = -1; - path_conv real_dir (dir, PC_SYM_NOFOLLOW, dir_suffixes); + path_conv real_dir (dir, PC_SYM_NOFOLLOW); if (real_dir.error) { -- cgit v1.2.3