JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix previous fix for generating unique inode numbers for sockets

Browse Source 
* fhandler.h (fhandler_base::get_plain_ino): New inline method.
	Add comment to explain what it's supposed to be used for.
	* fhandler_socket.cc (fhandler_socket::get_proc_fd_name): Create
	filename using inode number.
	(fhandler_socket::fstat): Generate inode number from filename if
	ino is not set (that's the case in a stat(2) call).
	* pipe.cc: Throughout, use get_plain_ino when appropriate.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2016-01-11 19:10:45 +01:00
parent b4cf3f454d
commit 27086d628e
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/fhandler_socket.cc
View File

@@ -250,7 +250,7 @@ fhandler_socket::~fhandler_socket ()
char *
fhandler_socket::get_proc_fd_name (char *buf)
{
__small_sprintf (buf, "socket:[%lu]", get_socket ());
__small_sprintf (buf, "socket:[%lu]", get_plain_ino ());
return buf;
}
@@ -939,7 +939,9 @@ fhandler_socket::fstat (struct stat *buf)
if (!res)
{
buf->st_dev = FHDEV (DEV_TCP_MAJOR, 0);
buf->st_ino = (ino_t) get_ino ();
if (!(buf->st_ino = get_plain_ino ()))
sscanf (get_name (), "/proc/%*d/fd/socket:[%lld]",
(long long *) &buf->st_ino);
buf->st_mode = S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO;
buf->st_size = 0;
}