* unix/tclUnixSock.c: Use a ProcessGlobalValue to store the

        * win/tclWinSock.c:     value returned by Tcl_GetHostName()
        ([info hostname]).  Also re-order initialization of the value
        on Windows to favor GetComputerName() over gethostname() as
        a source of the information.

3 files changed, 126 insertions, 103 deletions

diff --git a/ChangeLog b/ChangeLog
index cd4f1ef..46cde7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-13  Don Porter  <dgp@users.sourceforge.net>
+
+	* unix/tclUnixSock.c:	Use a ProcessGlobalValue to store the
+	* win/tclWinSock.c:	value returned by Tcl_GetHostName()
+	([info hostname]).  Also re-order initialization of the value
+	on Windows to favor GetComputerName() over gethostname() as
+	a source of the information.
+
 2005-07-12  Donal K. Fellows  <dkf@users.sf.net>
 
 	* doc/lsearch.n: Clarify documentation of -exact option; wording was
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index cdd45a5..6574935 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -8,78 +8,45 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixSock.c,v 1.11 2005/05/10 18:35:29 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixSock.c,v 1.12 2005/07/13 20:01:02 dgp Exp $
  */
 
 #include "tclInt.h"
 
 /*
- * There is no portable macro for the maximum length
- * of host names returned by gethostbyname().  We should only
- * trust SYS_NMLN if it is at least 255 + 1 bytes to comply with DNS
- * host name limits.
- *
- * Note:  SYS_NMLN is a restriction on "uname" not on gethostbyname!
- *
- * For example HP-UX 10.20 has SYS_NMLN == 9,  while gethostbyname()
- * can return a fully qualified name from DNS of up to 255 bytes.
- *
- * Fix suggested by Viktor Dukhovni (viktor@esm.com)
- */
-
-#if defined(SYS_NMLN) && SYS_NMLEN >= 256
-#define TCL_HOSTNAME_LEN SYS_NMLEN
-#else
-#define TCL_HOSTNAME_LEN 256
-#endif
-
-
-/*
  * The following variable holds the network name of this host.
  */
 
-static char hostname[TCL_HOSTNAME_LEN + 1];
-static int  hostnameInited = 0;
-TCL_DECLARE_MUTEX(hostMutex)
+static TclInitProcessGlobalValueProc	InitializeHostName;
+static ProcessGlobalValue hostName =
+	{0, 0, NULL, NULL, InitializeHostName, NULL, NULL};
 
 
 /*
  *----------------------------------------------------------------------
  *
- * Tcl_GetHostName --
+ * InitializeHostName --
  *
- *	Returns the name of the local host.
+ * 	This routine sets the process global value of the name of
+ * 	the local host on which the process is running.
  *
  * Results:
- *	A string containing the network name for this machine, or
- *	an empty string if we can't figure out the name.  The caller 
- *	must not modify or free this string.
- *
- * Side effects:
  *	None.
  *
  *----------------------------------------------------------------------
  */
 
-CONST char *
-Tcl_GetHostName()
+void
+InitializeHostName(valuePtr, lengthPtr, encodingPtr)
+    char **valuePtr;
+    int *lengthPtr;
+    Tcl_Encoding *encodingPtr;
 {
+    CONST char *native = NULL;
+
 #ifndef NO_UNAME
     struct utsname u;
     struct hostent *hp;
-#else
-    char buffer[sizeof(hostname)];
-#endif
-    CONST char *native;
-
-    Tcl_MutexLock(&hostMutex);
-    if (hostnameInited) {
-	Tcl_MutexUnlock(&hostMutex);
-        return hostname;
-    }
-
-    native = NULL;
-#ifndef NO_UNAME
     (VOID *) memset((VOID *) &u, (int) 0, sizeof(struct utsname));
     if (uname(&u) > -1) {				/* INTL: Native. */
         hp = gethostbyname(u.nodename);			/* INTL: Native. */
@@ -104,25 +71,64 @@ Tcl_GetHostName()
 	    native = u.nodename;
         }
     }
+    if (native == NULL) {
+	native = tclEmptyStringRep;
+    }
 #else
     /*
      * Uname doesn't exist; try gethostname instead.
+     *
+     * There is no portable macro for the maximum length
+     * of host names returned by gethostbyname().  We should only
+     * trust SYS_NMLN if it is at least 255 + 1 bytes to comply with DNS
+     * host name limits.
+     *
+     * Note:  SYS_NMLN is a restriction on "uname" not on gethostbyname!
+     *
+     * For example HP-UX 10.20 has SYS_NMLN == 9,  while gethostbyname()
+     * can return a fully qualified name from DNS of up to 255 bytes.
+     *
+     * Fix suggested by Viktor Dukhovni (viktor@esm.com)
      */
+#    if defined(SYS_NMLN) && SYS_NMLEN >= 256
+    char buffer[SYS_NMLEN];
+#    else
+    char buffer[256];
+#    endif
 
     if (gethostname(buffer, sizeof(buffer)) > -1) {	/* INTL: Native. */
 	native = buffer;
     }
 #endif
 
-    if (native == NULL) {
-	hostname[0] = 0;
-    } else {
-	Tcl_ExternalToUtf(NULL, NULL, native, -1, 0, NULL, hostname,
-		sizeof(hostname), NULL, NULL, NULL);
-    }
-    hostnameInited = 1;
-    Tcl_MutexUnlock(&hostMutex);
-    return hostname;
+    *encodingPtr = Tcl_GetEncoding(NULL, NULL);
+    *lengthPtr = strlen(native);
+    *valuePtr = ckalloc((unsigned int) (*lengthPtr)+1);
+    memcpy((VOID *) *valuePtr, (VOID *) native, (size_t)(*lengthPtr)+1);
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * Tcl_GetHostName --
+ *
+ *	Returns the name of the local host.
+ *
+ * Results:
+ *	A string containing the network name for this machine, or
+ *	an empty string if we can't figure out the name.  The caller 
+ *	must not modify or free this string.
+ *
+ * Side effects:
+ *	Caches the name to return for future calls.
+ *
+ *----------------------------------------------------------------------
+ */
+
+CONST char *
+Tcl_GetHostName()
+{
+    return Tcl_GetString(TclGetProcessGlobalValue(&hostName));
 }
 
 /*
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index e96eb96..8af394b 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinSock.c,v 1.46 2005/05/10 18:35:41 kennykb Exp $
+ * RCS: @(#) $Id: tclWinSock.c,v 1.47 2005/07/13 20:01:02 dgp Exp $
  */
 
 #include "tclWinInt.h"
@@ -28,13 +28,15 @@
  */
 
 static int initialized = 0;
-
-static int  hostnameInitialized = 0;
-static char hostname[255];	/* This buffer should be big enough for
-                                 * hostname plus domain name. */
-
 TCL_DECLARE_MUTEX(socketMutex)
 
+/*
+ * The following variable holds the network name of this host.
+ */
+
+static TclInitProcessGlobalValueProc    InitializeHostName;
+static ProcessGlobalValue hostName =
+	{0, 0, NULL, NULL, InitializeHostName, NULL, NULL};
 
 /*
  * Mingw, Cygwin and OpenWatcom may not have LPFN_* typedefs.
@@ -598,7 +600,6 @@ SocketExitHandler(clientData)
 	winSock.hModule = NULL;
     }
     initialized = 0;
-    hostnameInitialized = 0;
     Tcl_MutexUnlock(&socketMutex);
 }
 
@@ -2520,12 +2521,11 @@ SocketProc(hwnd, message, wParam, lParam)
  *	Returns the name of the local host.
  *
  * Results:
- *	A string containing the network name for this machine, or
- *	an empty string if we can't figure out the name.  The caller 
- *	must not modify or free this string.
+ *	A string containing the network name for this machine.
+ *	The caller must not modify or free this string.
  *
  * Side effects:
- *	None.
+ *	Caches the name to return for future calls.
  *
  *----------------------------------------------------------------------
  */
@@ -2533,49 +2533,58 @@ SocketProc(hwnd, message, wParam, lParam)
 CONST char *
 Tcl_GetHostName()
 {
-    DWORD length;
-    WCHAR wbuf[MAX_COMPUTERNAME_LENGTH + 1];
-
-    Tcl_MutexLock(&socketMutex);
-    InitSockets();
+    return Tcl_GetString(TclGetProcessGlobalValue(&hostName));
+}
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * InitializeHostName --
+ *
+ *      This routine sets the process global value of the name of
+ *      the local host on which the process is running.
+ *
+ * Results:
+ *      None.
+ *
+ *----------------------------------------------------------------------
+ */
 
-    if (hostnameInitialized) {
-	Tcl_MutexUnlock(&socketMutex);
-        return hostname;
-    }
-    Tcl_MutexUnlock(&socketMutex);
-	
-    if (TclpHasSockets(NULL) == TCL_OK) {
-	/*
-	 * INTL: bug
-	 */
+void
+InitializeHostName(valuePtr, lengthPtr, encodingPtr)
+    char **valuePtr;
+    int *lengthPtr;
+    Tcl_Encoding *encodingPtr;
+{
+    WCHAR wbuf[MAX_COMPUTERNAME_LENGTH + 1];
+    DWORD length = sizeof(wbuf) / sizeof(WCHAR);
+    Tcl_DString ds;
 
-	if (winSock.gethostname(hostname, sizeof(hostname)) == 0) {
-	    Tcl_MutexLock(&socketMutex);
-	    hostnameInitialized = 1;
-	    Tcl_MutexUnlock(&socketMutex);
-	    return hostname;
-	}
-    }
-    Tcl_MutexLock(&socketMutex);
-    length = sizeof(hostname);
     if ((*tclWinProcs->getComputerNameProc)(wbuf, &length) != 0) {
 	/*
 	 * Convert string from native to UTF then change to lowercase.
 	 */
-
-	Tcl_DString ds;
-
-	lstrcpynA(hostname, Tcl_WinTCharToUtf((TCHAR *) wbuf, -1, &ds),
-		sizeof(hostname));
-	Tcl_DStringFree(&ds);
-	Tcl_UtfToLower(hostname);
-    } else {
-	hostname[0] = '\0';
+	Tcl_UtfToLower(Tcl_WinTCharToUtf((TCHAR *) wbuf, -1, &ds));
+    } else if (TclpHasSockets(NULL) == TCL_OK) {
+	/*
+	 * Buffer length of 255 copied slavishly from previous version
+	 * of this routine.  Presumably there's a more "correct" macro
+	 * value for a properly sized buffer for a gethostname() call.
+	 * Maintainers are welcome to supply it.
+	 */
+	Tcl_DStringInit(&ds);
+	Tcl_DStringSetLength(&ds, 255);
+	if (winSock.gethostname(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds))
+		== 0) {
+	    Tcl_DStringSetLength(&ds, 0);
+	}
     }
-    hostnameInitialized = 1;
-    Tcl_MutexUnlock(&socketMutex);
-    return hostname;
+    *encodingPtr = Tcl_GetEncoding(NULL, "utf-8");
+    *lengthPtr = Tcl_DStringLength(&ds);
+    *valuePtr = ckalloc((unsigned int) (*lengthPtr)+1);
+    memcpy((VOID *) *valuePtr, (VOID *) Tcl_DStringValue(&ds),
+	    (size_t)(*lengthPtr)+1);
+    Tcl_DStringFree(&ds);
 }
 
 /*