summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--unix/tclUnixCompat.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 864c3e3..8e7a4c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-08 Andreas Kupries <andreask@activestate.com>
+
+ * unix/tclUnixCompat.c: Fixed conditions for CopyArray/CopyString,
+ and CopyHostent. Also fixed bad var names in TclpGetHostByName.
+
2006-09-08 Zoran Vasiljevic <vasiljevic@users.sourceforge.net>
* unix/tclUnixCompat.c: Added fallback to gethostbyname()
diff --git a/unix/tclUnixCompat.c b/unix/tclUnixCompat.c
index 5ab7ea3..a7d40a7 100644
--- a/unix/tclUnixCompat.c
+++ b/unix/tclUnixCompat.c
@@ -6,7 +6,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.6 2006/09/08 11:15:14 vasiljevic Exp $
+ * RCS: @(#) $Id: tclUnixCompat.c,v 1.1.2.7 2006/09/08 19:25:13 andreas_kupries Exp $
*
*/
@@ -57,8 +57,8 @@ static Tcl_ThreadDataKey dataKey;
Tcl_Mutex compatLock;
-#if (!defined(HAVE_GETHOSTBYNAME_R) && !defined(HAVE_GETHOSTBYADDR_R)) || \
- (!defined(HAVE_GETPWUID_R) && !defined(HAVE_GETGRGID_R))
+#if (!defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R)) || \
+ (!defined(HAVE_GETPWUID_R) || !defined(HAVE_GETGRGID_R))
/*
@@ -156,7 +156,7 @@ CopyString(char *src, char *buf, int buflen)
!defined(HAVE_GETPWUID_R) && !defined(HAVE_GETGRGID_R) */
-#if !defined(HAVE_GETHOSTBYNAME_R) && !defined(HAVE_GETHOSTBYADDR_R)
+#if !defined(HAVE_GETHOSTBYNAME_R) || !defined(HAVE_GETHOSTBYADDR_R)
/*
*---------------------------------------------------------------------------
@@ -580,8 +580,8 @@ TclpGetHostByName(const char *name)
#elif defined(HAVE_GETHOSTBYNAME_R_3)
struct hostent_data data;
- return (gethostbyname_r(host, &tsdPtr->hent, &data) == 0) ?
- &tsdPtr->buf.hent : NULL;
+ return (gethostbyname_r(name, &tsdPtr->hent, &data) == 0) ?
+ &tsdPtr->hent : NULL;
#else
struct hostent *hePtr;
Tcl_MutexLock(&compatLock);