From d358c9e9b084d4154a1cf994abfe9b9d09597b3d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Mon, 12 Oct 2009 11:57:29 +0000 Subject: * fhandler_disk_file.cc (fhandler_disk_file::link): Only append .lnk if the original device had one, too. Add comment. * fhandler_socket.cc (fhandler_socket::fstat): Always return a size of 0 on sockets. --- winsup/cygwin/fhandler_disk_file.cc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'winsup/cygwin/fhandler_disk_file.cc') diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 1e6a781e0..eaf065f1e 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1210,7 +1210,12 @@ fhandler_disk_file::link (const char *newpath) char new_buf[nlen + 5]; if (!newpc.error) { - if (pc.is_lnk_special ()) + /* If the original file is a lnk special file (except for sockets), + and if the original file has a .lnk suffix, add one to the hardlink + as well. */ + if (pc.is_lnk_special () && !pc.issocket () + && RtlEqualUnicodePathSuffix (pc.get_nt_native_path (), + &ro_u_lnk, TRUE)) { /* Shortcut hack. */ stpcpy (stpcpy (new_buf, newpath), ".lnk"); -- cgit v1.2.3