From cf762b08cfb010d9d63e4ca44658c80bdf6ed8cb Mon Sep 17 00:00:00 2001
From: Corinna Vinschen <corinna@vinschen.de>
Date: Fri, 21 Feb 2003 14:29:18 +0000
Subject: 	* dtable.cc (dtable::build_fhandler_from_name): Set some
 fhandler 	data on sockets to evaluate AF_LOCAL sockets correctly. 
 (dtable::build_fhandler): Set unit number on sockets. 	* fhandler.h
 (fhandler_socket): Add unit number. 	(fhandler_socket::get_unit): New
 method. 	* fhandler_socket.cc (fhandler_socket::fhandler_socket): Set
 unit 	number. 	(fhandler_socket::fstat): Reorganize to return more
 Linux-like 	values. 	* net.cc: include ctype.h. 	(fdsock): Set
 unit number when building fhandler. 	* path.cc (path_conv::check): Set
 device type to FH_SOCKET if file 	is a AF_UNIX socket. 	(get_devn):
 Evaluate unit for virtual socket devices. 	(win32_device_name): Set
 windows path for sockets to unix_path with 	just backslashes to keep the
 different names. 	* syscalls.cc (fstat64): Don't override st_ino, st_dev
 and st_rdev 	for sockets. 	(stat_worker): Ditto.

From Pierre Humblet:

	* autoload.cc (AccessCheck): Add.
	(DuplicateToken): Add.
	* security.h (check_file_access): Declare.
	* syscalls.cc (access): Convert path to Windows, check existence
	and readonly attribute. Call check_file_access instead of acl_access.
	* security.cc (check_file_access): Create.
	* sec_acl (acl_access): Delete.
---
 winsup/cygwin/fhandler_socket.cc | 47 +++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 6 deletions(-)

(limited to 'winsup/cygwin/fhandler_socket.cc')

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 6c867f927..b10e28a8c 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -94,8 +94,8 @@ get_inet_addr (const struct sockaddr *in, int inlen,
 /**********************************************************************/
 /* fhandler_socket */
 
-fhandler_socket::fhandler_socket ()
-  : fhandler_base (FH_SOCKET), sun_path (NULL)
+fhandler_socket::fhandler_socket (int nunit)
+  : fhandler_base (FH_SOCKET), unit (nunit), sun_path (NULL)
 {
   set_need_fork_fixup ();
   prot_info_ptr = (LPWSAPROTOCOL_INFOA) cmalloc (HEAP_BUF,
@@ -309,12 +309,47 @@ fhandler_socket::dup (fhandler_base *child)
 int __stdcall
 fhandler_socket::fstat (struct __stat64 *buf, path_conv *pc)
 {
-  int res = fhandler_base::fstat (buf, pc);
+  int res;
+  if (get_addr_family () == AF_LOCAL && get_sun_path ())
+    {
+      path_conv spc (get_sun_path (),
+                     PC_SYM_NOFOLLOW | PC_NULLEMPTY | PC_FULL | PC_POSIX,
+		     NULL);
+      fhandler_base *fh = cygheap->fdtab.build_fhandler (-1, FH_DISK,
+      							 get_sun_path (),
+							 spc, 0);
+      if (fh)
+        {
+	  res = fh->fstat (buf, &spc);
+	  /* Faking Linux like values on top of the file specific values. */
+	  if (get_socket_type ()) /* fstat() */
+	    {
+	      buf->st_dev = 0;
+	      buf->st_mode |= S_IRWXU | S_IRWXG | S_IRWXO;
+	      buf->st_ino = (ino_t) get_handle ();
+	    }
+	  buf->st_rdev = buf->st_size = buf->st_blocks = 0;
+	  return res;
+	}
+    }
+
+  res = fhandler_base::fstat (buf, pc);
   if (!res)
     {
-      buf->st_mode &= ~_IFMT;
-      buf->st_mode |= _IFSOCK;
-      buf->st_ino = (ino_t) get_handle ();
+      if (get_socket_type ()) /* fstat */
+        {
+	  buf->st_ino = (ino_t) get_handle ();
+	  buf->st_mode &= ~S_IFMT;
+	  buf->st_mode |= S_IFSOCK;
+	}
+      else
+        {
+	  path_conv spc ("/dev", PC_SYM_NOFOLLOW | PC_NULLEMPTY, NULL);
+	  buf->st_dev = spc.volser ();
+	  buf->st_ino = (ino_t) get_namehash ();
+	  buf->st_mode &= ~S_IRWXO;
+	  buf->st_rdev = (get_device () << 16) | get_unit ();
+	}
     }
   return res;
 }
-- 
cgit v1.2.3