merge from trunk

2 files changed, 69 insertions, 27 deletions

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index b2639ac5f7b..e2afc3d7ac1 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,13 @@
+2003-03-01  Corinna Vinschen <corinna@vinschen.de>
+
+	* fhandler_socket.cc (fhandler_socket::bind): Open and write socket
+	file using Win32 calls.
+
+2003-03-01  Corinna Vinschen <corinna@vinschen.de>
+
+	* fhandler_socket.cc (get_inet_addr): Open and read socket file using
+	Win32 calls.
+
 2003-02-28  Christopher Faylor  <cgf@redhat.com>
 
 	* cygwin.din: Wrap atexit and exit with cygwin, thread-safe functions.
diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index 124d9330d03..461d629a1e8 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -60,15 +60,35 @@ get_inet_addr (const struct sockaddr *in, int inlen,
     }
   else if (in->sa_family == AF_LOCAL)
     {
-      int fd = open (in->sa_data, O_RDONLY);
-      if (fd == -1)
-	return 0;
-
+      path_conv pc (in->sa_data, PC_SYM_FOLLOW);
+      if (pc.error)
+        {
+	  set_errno (pc.error);
+	  return 0;
+	}
+      if (!pc.exists ())
+        {
+	  set_errno (ENOENT);
+	  return 0;
+	}
+      if (!pc.issocket ())
+        {
+	  set_errno (EBADF);
+	  return 0;
+	}
+      HANDLE fh = CreateFile (pc, GENERIC_READ, wincap.shared (), &sec_none,
+			      OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
+      if (fh == INVALID_HANDLE_VALUE)
+        {
+	  __seterrno ();
+	  return 0;
+	}
       int ret = 0;
+      DWORD len = 0;
       char buf[128];
       memset (buf, 0, sizeof buf);
-      if (read (fd, buf, sizeof buf) != -1)
-	{
+      if (ReadFile (fh, buf, 128, &len, 0))
+        {
 	  sockaddr_in sin;
 	  sin.sin_family = AF_INET;
 	  sscanf (buf + strlen (SOCKET_COOKIE), "%hu %08x-%08x-%08x-%08x",
@@ -80,7 +100,7 @@ get_inet_addr (const struct sockaddr *in, int inlen,
 	  *outlen = sizeof sin;
 	  ret = 1;
 	}
-      close (fd);
+      CloseHandle (fh);
       return ret;
     }
   else
@@ -404,7 +424,6 @@ fhandler_socket::bind (const struct sockaddr *name, int namelen)
 #define un_addr ((struct sockaddr_un *) name)
       struct sockaddr_in sin;
       int len = sizeof sin;
-      int fd;
 
       if (strlen (un_addr->sun_path) >= UNIX_PATH_LEN)
 	{
@@ -430,35 +449,48 @@ fhandler_socket::bind (const struct sockaddr *name, int namelen)
       sin.sin_port = ntohs (sin.sin_port);
       debug_printf ("AF_LOCAL: socket bound to port %u", sin.sin_port);
 
-      /* bind must fail if file system socket object already exists
-	 so _open () is called with O_EXCL flag. */
-      fd = ::open (un_addr->sun_path, O_WRONLY | O_CREAT | O_EXCL | O_BINARY, 0);
-      if (fd < 0)
-	{
-	  if (get_errno () == EEXIST)
-	    set_errno (EADDRINUSE);
+      path_conv pc (un_addr->sun_path, PC_SYM_FOLLOW);
+      if (pc.error)
+        {
+          set_errno (pc.error);
+	  goto out;
+	}
+      if (pc.exists ())
+        {
+	  set_errno (EADDRINUSE);
 	  goto out;
 	}
+      mode_t mode = (S_IRWXU | S_IRWXG | S_IRWXO) & ~cygheap->umask;
+      DWORD attr = FILE_ATTRIBUTE_SYSTEM;
+      if (!(mode & (S_IWUSR | S_IWGRP | S_IWOTH)))
+        attr |= FILE_ATTRIBUTE_READONLY;
+      SECURITY_ATTRIBUTES sa = sec_none;
+      if (allow_ntsec && pc.has_acls ())
+        set_security_attribute (mode, &sa, alloca (4096), 4096);
+      HANDLE fh = CreateFile (pc, GENERIC_WRITE, 0, &sa, CREATE_NEW, attr, 0);
+      if (fh == INVALID_HANDLE_VALUE)
+        {
+	  if (GetLastError () == ERROR_ALREADY_EXISTS)
+	    set_errno (EADDRINUSE);
+	  else
+	    __seterrno ();
+	}
 
       set_connect_secret ();
 
       char buf[sizeof (SOCKET_COOKIE) + 80];
       __small_sprintf (buf, "%s%u ", SOCKET_COOKIE, sin.sin_port);
       get_connect_secret (strchr (buf, '\0'));
-      len = strlen (buf) + 1;
-
-      /* Note that the terminating nul is written.  */
-      if (::write (fd, buf, len) != len)
-	{
-	  save_errno here;
-	  ::close (fd);
-	  unlink (un_addr->sun_path);
+      DWORD blen = strlen (buf) + 1;
+      if (!WriteFile (fh, buf, blen, &blen, 0))
+        {
+	  __seterrno ();
+	  CloseHandle (fh);
+	  DeleteFile (pc);
 	}
       else
-	{
-	  ::close (fd);
-	  chmod (un_addr->sun_path,
-		 (S_IFSOCK | S_IRWXU | S_IRWXG | S_IRWXO) & ~cygheap->umask);
+        {
+	  CloseHandle (fh);
 	  set_sun_path (un_addr->sun_path);
 	  res = 0;
 	}