summaryrefslogtreecommitdiffstats
path: root/unix
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2005-07-13 20:00:54 (GMT)
committerdgp <dgp@users.sourceforge.net>2005-07-13 20:00:54 (GMT)
commit70659c925bebf81737346ba182a45a533d7894d6 (patch)
tree968fb00859fca6dbcc7905730572d3aefbf7d85c /unix
parent7b92be76b5ce085131887664235bfff477d92969 (diff)
downloadtcl-70659c925bebf81737346ba182a45a533d7894d6.zip
tcl-70659c925bebf81737346ba182a45a533d7894d6.tar.gz
tcl-70659c925bebf81737346ba182a45a533d7894d6.tar.bz2
* 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.
Diffstat (limited to 'unix')
-rw-r--r--unix/tclUnixSock.c118
1 files changed, 62 insertions, 56 deletions
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));
}
/*