libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* 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.
This commit is contained in:
Corinna Vinschen 2009-10-12 11:57:29 +00:00
parent 2072888e66
commit d358c9e9b0
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2009-10-12 Corinna Vinschen <corinna@vinschen.de>
* 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.
2009-10-09 Corinna Vinschen <corinna@vinschen.de> 2009-10-09 Corinna Vinschen <corinna@vinschen.de>
* path.cc (tfx_chars): Convert all ASCII control characters except * path.cc (tfx_chars): Convert all ASCII control characters except

7
winsup/cygwin/fhandler_disk_file.cc
View File

@ -1210,7 +1210,12 @@ fhandler_disk_file::link (const char *newpath)
char new_buf[nlen + 5]; char new_buf[nlen + 5];
if (!newpc.error) 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. */ /* Shortcut hack. */
stpcpy (stpcpy (new_buf, newpath), ".lnk"); stpcpy (stpcpy (new_buf, newpath), ".lnk");

2
winsup/cygwin/fhandler_socket.cc
View File

@ -698,6 +698,7 @@ fhandler_socket::fstat (struct __stat64 *buf)
if (!res) if (!res)
{ {
buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK; buf->st_mode = (buf->st_mode & ~S_IFMT) | S_IFSOCK;
buf->st_size = 0;
} }
} }
else else
@ -708,6 +709,7 @@ fhandler_socket::fstat (struct __stat64 *buf)
buf->st_dev = 0; buf->st_dev = 0;
buf->st_ino = (__ino64_t) ((DWORD) get_handle ()); buf->st_ino = (__ino64_t) ((DWORD) get_handle ());
buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO; buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO;
buf->st_size = 0;
} }
} }
return res; return res;