Rework the error message generation of [socket], so that the error

code of getaddrinfo is used instead of errno unless it is EAI_SYSTEM.

4 files changed, 30 insertions, 40 deletions

diff --git a/ChangeLog b/ChangeLog
index b84440c..412ea68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-06-22  Reinhard Max  <max@suse.de>
+
+	* generic/tclIOSock.c: Rework the error message generation of [socket],
+	* unix/tclUnixSock.c:  so that the error code of getaddrinfo is used
+	* win/tclWinSock.c:    instead of errno unless it is EAI_SYSTEM.
+
 2012-06-21  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* win/tclWinReg.c:          [Bug #3362446]: registry keys command fails
diff --git a/generic/tclIOSock.c b/generic/tclIOSock.c
index 89d6c02..6a7be7e 100644
--- a/generic/tclIOSock.c
+++ b/generic/tclIOSock.c
@@ -206,7 +206,10 @@ TclCreateSocketAddress(
     }
 
     if (result != 0) {
-	goto error;
+        if (result != EAI_SYSTEM) {
+            *errorMsgPtr = gai_strerror(result);
+        }
+        return 0;
     }
 
     /*
@@ -249,33 +252,6 @@ TclCreateSocketAddress(
     }
     
     return 1;
-	
-    /*
-     * Ought to use gai_strerror() here...
-     */
-
-error:
-    switch (result) {
-    case EAI_NONAME:
-    case EAI_SERVICE:
-#if defined(EAI_ADDRFAMILY) && EAI_ADDRFAMILY != EAI_NONAME
-    case EAI_ADDRFAMILY:
-#endif
-#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
-    case EAI_NODATA:
-#endif
-	*errorMsgPtr = gai_strerror(result);
-	errno = EHOSTUNREACH;
-	return 0;
-#ifdef EAI_SYSTEM
-    case EAI_SYSTEM:
-	return 0;
-#endif
-    default:
-	*errorMsgPtr = gai_strerror(result);
-	errno = ENXIO;
-	return 0;
-    }
 }
 
 /*
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 12e5a9a..f6abfd5 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -1117,10 +1117,11 @@ Tcl_OpenTcpClient(
             freeaddrinfo(addrlist);
         }
         if (interp != NULL) {
-            Tcl_AppendResult(interp, "couldn't open socket: ",
-                             Tcl_PosixError(interp), NULL);
-            if (errorMsg != NULL) {
-                Tcl_AppendResult(interp, " (", errorMsg, ")", NULL);
+            Tcl_AppendResult(interp, "couldn't open socket: ", NULL);
+            if (errorMsg == NULL) {
+                Tcl_AppendResult(interp, Tcl_PosixError(interp), NULL);
+            } else {
+                Tcl_AppendResult(interp, errorMsg, NULL);
             }
         }
         return NULL;
@@ -1261,10 +1262,11 @@ Tcl_OpenTcpServer(
      * Try to record and return the most meaningful error message, i.e. the
      * one from the first socket that went the farthest before it failed.
      */
-    enum { START, SOCKET, BIND, LISTEN } howfar = START;
+    enum { LOOKUP, SOCKET, BIND, LISTEN } howfar = LOOKUP;
     int my_errno = 0;
 
     if (!TclCreateSocketAddress(interp, &addrlist, myHost, port, 1, &errorMsg)) {
+	my_errno = errno;
 	goto error;
     }
 
@@ -1392,11 +1394,12 @@ Tcl_OpenTcpServer(
 	return statePtr->channel;
     }
     if (interp != NULL) {
-	errno = my_errno;
-	Tcl_AppendResult(interp, "couldn't open socket: ",
-		Tcl_PosixError(interp), NULL);
-	if (errorMsg != NULL) {
-	    Tcl_AppendResult(interp, " (", errorMsg, ")", NULL);
+	Tcl_AppendResult(interp, "couldn't open socket: ", NULL);
+	if (errorMsg == NULL) {
+            errno = my_errno;
+            Tcl_AppendResult(interp, Tcl_PosixError(interp), NULL);
+        } else {
+	    Tcl_AppendResult(interp, errorMsg, NULL);
 	}
     }
     if (sock != -1) {
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index f0c2251..166fdfd 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -1280,9 +1280,14 @@ CreateSocket(
     }
 
     if (interp != NULL) {
-	Tcl_AppendResult(interp, "couldn't open socket: ",
-		Tcl_PosixError(interp), NULL);
+        Tcl_AppendResult(interp, "couldn't open socket: ", NULL);
+        if (errorMsg == NULL) {
+            Tcl_AppendResult(interp, Tcl_PosixError(interp), NULL);
+        } else {
+            Tcl_AppendResult(interp, errorMsg, NULL);
+        }
     }
+
     if (sock != INVALID_SOCKET) {
 	closesocket(sock);
     }