Changeset 4000

Timestamp:

2005年12月14日 00時27分59秒 (3 years ago)

Author:

horiguti

Message:

Enable to get correct code for socket error.

Files:

• trunk/src/ChangeLog.Meadow (modified) (1 diff)
• trunk/src/process.c (modified) (2 diffs)
• trunk/src/w32.c (modified) (4 diffs)

trunk/src/ChangeLog.Meadow

@@ +1 @@
+2005-12-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
+
+        * w32.c (sys_getsockopt): New function.
+        (pfn_getsockopt): New function pointer.
+        (init_winsock): Initialize pfn_getsockopt.
+
+        * process.c (wait_reading_process_output): Get errno by
+        sys_getsockopt.
+
-2005-12-13  Kyotaro HORIGUCHI  <horiguti@meadowy.org>
-

trunk/src/process.c

@@ -4709 +4709 @@
-#else
-              {
+#ifdef MEADOW
+                int xlen = sizeof (xerrno);
+                if (sys_getsockopt (channel,
+                                    SOL_SOCKET, SO_ERROR, &xerrno, &xlen))
+                  xerrno = errno;
+#else
-                struct sockaddr pname;
-                int pnamelen = sizeof(pname);
@@ -4722 +4728 @@
-                      xerrno = errno;
-                  }
+#endif /* Meadow */
-              }
-#endif

trunk/src/w32.c

@@ -98 +98 @@
-#undef shutdown
-#undef setsockopt
+#undef getsockopt
-#undef listen
-#undef getsockname
@@ -3093 +3094 @@
-int (PASCAL *pfn_setsockopt) (SOCKET s, int level, int optname,
-                              const char * optval, int optlen);
+int (PASCAL *pfn_getsockopt) (SOCKET s, int level, int optname,
+                              const char * optval, int *optlen);
-int (PASCAL *pfn_listen) (SOCKET s, int backlog);
-int (PASCAL *pfn_getsockname) (SOCKET s, struct sockaddr * name,
@@ -3176 +3179 @@
-      LOAD_PROC( WSACleanup );
-      LOAD_PROC( setsockopt );
+      LOAD_PROC( getsockopt );
-      LOAD_PROC( listen );
-      LOAD_PROC( getsockname );
@@ -3726 +3730 @@
-}
-
+#ifdef MEADOW
+int
+sys_getsockopt (int s, int level, int optname, char *optval, int *optlen)
+{
+  if (winsock_lib == NULL)
+    {
+      h_errno = ENETDOWN;
+      return SOCKET_ERROR;
+    }
+
+  check_errno ();
+  if (fd_info[s].flags & FILE_SOCKET)
+    {
+      int rc = pfn_getsockopt (SOCK_HANDLE (s),
+                               level, optname, optval, optlen);
+      if (rc == SOCKET_ERROR)
+        set_errno ();
+      return rc;
+    }
+  h_errno = ENOTSOCK;
+  return SOCKET_ERROR;
+}
+#endif
+
-int
-sys_listen (int s, int backlog)