From dda0657380d0383935d80bf62a3d305df849bb6f Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Thu, 14 Apr 2005 17:34:03 +0000 Subject: * dcrt0.cc (do_global_dtors): Run DLL dtors. (__main): Don't rely on atexit to run dtors. (do_exit): Specifically call do_global_dtors here. (cygwin_exit): Ditto. * dll_init.cc (dll_global_dtors): Make global. Only run dtors once. (dll_list::init): Just set flag that dtors should be run. Don't rely on atexit. * dll_init.h (dll_global_dtors): Declare. * exceptions.cc (sigrelse): Define. * path.h (is_fs_device): New method. (is_lnk_special): Ditto. * fhandler_disk_file.cc (fhandler_disk_file::link): Use "is_lnk_special" rather than "is_lnk_symlink". * syscalls.cc (rename): Ditto. * hookapi.cc (ld_preload): Use colon as a separator rather than space. --- winsup/cygwin/syscalls.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/syscalls.cc') diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index b3e7eb04f..da50b4fad 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1135,7 +1135,7 @@ rename (const char *oldpath, const char *newpath) /* Shortcut hack. */ char new_lnk_buf[CYG_MAX_PATH + 5]; - if (real_old.is_lnk_symlink () && !real_new.error && !real_new.case_clash) + if (real_old.is_lnk_special () && !real_new.error && !real_new.case_clash) { strcpy (new_lnk_buf, newpath); strcat (new_lnk_buf, ".lnk"); @@ -1170,7 +1170,7 @@ rename (const char *oldpath, const char *newpath) SetFileAttributes (real_new, (DWORD) real_new & ~FILE_ATTRIBUTE_READONLY); /* Shortcut hack No. 2, part 1 */ - if (!real_old.issymlink () && !real_new.error && real_new.is_lnk_symlink () + if (!real_old.issymlink () && !real_new.error && real_new.is_lnk_special () && (lnk_suffix = strrchr (real_new.get_win32 (), '.'))) *lnk_suffix = '\0'; -- cgit v1.2.3