Updating magic client nspr branch to nspr 4 rtm tag

19 files changed, 67 insertions, 67 deletions

diff --git a/config/Linux.mk b/config/Linux.mk
index 29832d08..21c85ebc 100644
--- a/config/Linux.mk
+++ b/config/Linux.mk
@@ -47,8 +47,6 @@ IMPL_STRATEGY		= _PTH
 DEFINES			+= -D_REENTRANT
 endif
 
-USE_IPV6 = 1
-
 ifeq (86,$(findstring 86,$(OS_TEST)))
 CPU_ARCH		:= x86
 else
diff --git a/pr/include/md/_aix32in6.cfg b/pr/include/md/_aix32in6.cfg
index 0385e86a..fcaec9d9 100644
--- a/pr/include/md/_aix32in6.cfg
+++ b/pr/include/md/_aix32in6.cfg
@@ -73,9 +73,6 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
-#ifndef _PR_INET6
-#define _PR_INET6
-#endif
 #define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
diff --git a/pr/include/md/_aix64.cfg b/pr/include/md/_aix64.cfg
index 59bb1a79..8606ff74 100644
--- a/pr/include/md/_aix64.cfg
+++ b/pr/include/md/_aix64.cfg
@@ -74,9 +74,6 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
-#ifndef _PR_INET6
-#define _PR_INET6
-#endif
 #define PR_AF_INET6 24  /* same as AF_INET6 */
 
 #ifndef NO_NSPR_10_SUPPORT
diff --git a/pr/include/md/_beos.cfg b/pr/include/md/_beos.cfg
index a1e3d89d..cbdaecdd 100644
--- a/pr/include/md/_beos.cfg
+++ b/pr/include/md/_beos.cfg
@@ -27,6 +27,8 @@
 #define BEOS
 #endif
 
+#define PR_AF_INET6 5  /* same as AF_INET6 */
+
 #ifdef __powerpc__
 #undef  IS_LITTLE_ENDIAN
 #define IS_BIG_ENDIAN 1
diff --git a/pr/include/md/_bsdi.cfg b/pr/include/md/_bsdi.cfg
index 8a9839a4..5b7fa33f 100644
--- a/pr/include/md/_bsdi.cfg
+++ b/pr/include/md/_bsdi.cfg
@@ -27,6 +27,8 @@
 #define BSDI
 #endif
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #if defined(__i386__)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_darwin.cfg b/pr/include/md/_darwin.cfg
index 87a76c95..33da779e 100644
--- a/pr/include/md/_darwin.cfg
+++ b/pr/include/md/_darwin.cfg
@@ -27,6 +27,8 @@
 #define RHAPOSDY
 #endif
 
+#define PR_AF_INET6 30  /* same as AF_INET6 */
+
 #if defined(i386)
 #undef IS_BIG_ENDIAN
 #define  IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_freebsd.cfg b/pr/include/md/_freebsd.cfg
index b61641cf..167cf8b6 100644
--- a/pr/include/md/_freebsd.cfg
+++ b/pr/include/md/_freebsd.cfg
@@ -33,6 +33,8 @@
 #undef	HAVE_ALIGNED_DOUBLES
 #undef	HAVE_ALIGNED_LONGLONGS
 
+#define PR_AF_INET6 28  /* same as AF_INET6 */
+
 #if defined(__i386__)
 
 #define PR_BYTES_PER_BYTE   1
diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
index 11885b41..e3a5233f 100644
--- a/pr/include/md/_linux.h
+++ b/pr/include/md/_linux.h
@@ -70,7 +70,8 @@
 #else
 #define _PR_NO_LARGE_FILES
 #endif
-#ifdef _PR_INET6
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
+#define _PR_INET6
 #define _PR_HAVE_GETHOSTBYNAME2
 #define _PR_INET6_PROBE
 #endif
@@ -97,11 +98,11 @@ extern void _MD_CleanupBeforeExit(void);
  * On the PowerPC, the new style jmp_buf isn't used until glibc
  * 2.1.
  */
-#if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+#if (__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1)
 #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[JB_GPR1]
 #else
 #define _MD_GET_SP(_t) (_t)->md.context[0].__jmpbuf[0].__misc[0]
-#endif /* __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 */
+#endif /* glibc 2.1 or later */
 #define _MD_SET_FP(_t, val)
 #define _MD_GET_SP_PTR(_t) &(_MD_GET_SP(_t))
 #define _MD_GET_FP_PTR(_t) ((void *) 0)
diff --git a/pr/include/md/_netbsd.cfg b/pr/include/md/_netbsd.cfg
index ef52198e..c8fc684a 100644
--- a/pr/include/md/_netbsd.cfg
+++ b/pr/include/md/_netbsd.cfg
@@ -27,6 +27,8 @@
 #define NETBSD
 #endif
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #if defined(__i386__) || defined(__arm32__)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_nto.cfg b/pr/include/md/_nto.cfg
index dd3a5aef..cae799f7 100644
--- a/pr/include/md/_nto.cfg
+++ b/pr/include/md/_nto.cfg
@@ -27,6 +27,8 @@
 #define NTO
 #endif
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #ifdef __i386__
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_openbsd.cfg b/pr/include/md/_openbsd.cfg
index ae3bfcda..994daf32 100644
--- a/pr/include/md/_openbsd.cfg
+++ b/pr/include/md/_openbsd.cfg
@@ -27,6 +27,8 @@
 #define OPENBSD
 #endif
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #if defined(__i386__) || defined(__arm32__)
 
 #define IS_LITTLE_ENDIAN 1
diff --git a/pr/include/md/_openvms.cfg b/pr/include/md/_openvms.cfg
index b9dd6d97..17548c27 100644
--- a/pr/include/md/_openvms.cfg
+++ b/pr/include/md/_openvms.cfg
@@ -36,6 +36,8 @@
 #undef IS_64
 #endif
 
+#define PR_AF_INET6 26  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_os2.cfg b/pr/include/md/_os2.cfg
index f72eab69..a11e7cf3 100644
--- a/pr/include/md/_os2.cfg
+++ b/pr/include/md/_os2.cfg
@@ -39,6 +39,8 @@
 #define HAVE_LONG_LONG 1
 #endif
 
+#define PR_AF_INET6 24  /* same as AF_INET6 */
+
 #define PR_BYTES_PER_BYTE   1
 #define PR_BYTES_PER_SHORT  2
 #define PR_BYTES_PER_INT    4
diff --git a/pr/include/md/_rhapsody.cfg b/pr/include/md/_rhapsody.cfg
index 87a76c95..33da779e 100644
--- a/pr/include/md/_rhapsody.cfg
+++ b/pr/include/md/_rhapsody.cfg
@@ -27,6 +27,8 @@
 #define RHAPOSDY
 #endif
 
+#define PR_AF_INET6 30  /* same as AF_INET6 */
+
 #if defined(i386)
 #undef IS_BIG_ENDIAN
 #define  IS_LITTLE_ENDIAN 1
diff --git a/pr/include/prio.h b/pr/include/prio.h
index 36017128..015e9be2 100644
--- a/pr/include/prio.h
+++ b/pr/include/prio.h
@@ -179,34 +179,6 @@ union PRNetAddr {
 };
 
 /*
-** The PR_NETADDR_SIZE macro can only be called on a PRNetAddr union
-** whose 'family' field is set.  It returns the size of the union
-** member corresponding to the specified address family.
-*/
-
-#if defined(_PR_INET6)
-
-#define PR_NETADDR_SIZE(_addr) PR_NetAddrSize(_addr)
-
-#else
-
-#if defined(XP_UNIX)
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : ((_addr)->raw.family == PR_AF_INET6	\
-        ? sizeof((_addr)->ipv6)					\
-        : sizeof((_addr)->local)))
-#else
-#define PR_NETADDR_SIZE(_addr) 					\
-        ((_addr)->raw.family == PR_AF_INET		\
-        ? sizeof((_addr)->inet)					\
-        : sizeof((_addr)->ipv6))
-#endif /* defined(XP_UNIX) */
-
-#endif /* defined(_PR_INET6) */
-
-/*
 ***************************************************************************
 ** PRSockOption
 **
@@ -1108,8 +1080,6 @@ NSPR_API(PRStatus) PR_MakeDir(const char *name, PRIntn mode);
 
 NSPR_API(PRStatus) PR_RmDir(const char *name);
 
-NSPR_API(PRUintn) PR_NetAddrSize(const PRNetAddr* addr);
-
 /*
  *************************************************************************
  * FUNCTION: PR_NewUDPSocket
diff --git a/pr/include/private/primpl.h b/pr/include/private/primpl.h
index 926c2585..a0378650 100644
--- a/pr/include/private/primpl.h
+++ b/pr/include/private/primpl.h
@@ -1268,6 +1268,36 @@ extern PRFileDesc *_PR_InvalidDesc(void);
 
 extern PRIOMethods _pr_faulty_methods;
 
+/*
+** The PR_NETADDR_SIZE macro can only be called on a PRNetAddr union
+** whose 'family' field is set.  It returns the size of the union
+** member corresponding to the specified address family.
+*/
+
+extern PRUintn _PR_NetAddrSize(const PRNetAddr* addr);
+
+#if defined(_PR_INET6)
+
+#define PR_NETADDR_SIZE(_addr) _PR_NetAddrSize(_addr)
+
+#else
+
+#if defined(XP_UNIX)
+#define PR_NETADDR_SIZE(_addr) 					\
+        ((_addr)->raw.family == PR_AF_INET		\
+        ? sizeof((_addr)->inet)					\
+        : ((_addr)->raw.family == PR_AF_INET6	\
+        ? sizeof((_addr)->ipv6)					\
+        : sizeof((_addr)->local)))
+#else
+#define PR_NETADDR_SIZE(_addr) 					\
+        ((_addr)->raw.family == PR_AF_INET		\
+        ? sizeof((_addr)->inet)					\
+        : sizeof((_addr)->ipv6))
+#endif /* defined(XP_UNIX) */
+
+#endif /* defined(_PR_INET6) */
+
 extern PRStatus _PR_MapOptionName(
     PRSockOption optname, PRInt32 *level, PRInt32 *name);
 extern void _PR_InitThreads(
diff --git a/pr/src/misc/prnetdb.c b/pr/src/misc/prnetdb.c
index f31374b3..38b81cd1 100644
--- a/pr/src/misc/prnetdb.c
+++ b/pr/src/misc/prnetdb.c
@@ -863,7 +863,7 @@ PR_IMPLEMENT(PRStatus) PR_GetProtoByNumber(
 
 }
 
-PR_IMPLEMENT(PRUintn) PR_NetAddrSize(const PRNetAddr* addr)
+PRUintn _PR_NetAddrSize(const PRNetAddr* addr)
 {
     PRUintn addrsize;
 
@@ -890,7 +890,7 @@ PR_IMPLEMENT(PRUintn) PR_NetAddrSize(const PRNetAddr* addr)
     else addrsize = 0;
 
     return addrsize;
-}  /* PR_NetAddrSize */
+}  /* _PR_NetAddrSize */
 
 PR_IMPLEMENT(PRIntn) PR_EnumerateHostEnt(
     PRIntn enumIndex, const PRHostEnt *hostEnt, PRUint16 port, PRNetAddr *address)
diff --git a/pr/tests/ipv6.c b/pr/tests/ipv6.c
index 4029fedd..5914cbda 100644
--- a/pr/tests/ipv6.c
+++ b/pr/tests/ipv6.c
@@ -16,15 +16,6 @@
  * Reserved.
  */
 
-#ifdef XP_BEOS
-#include <stdio.h>
-int main()
-{
-    printf( "BeOS does not support IPv6\n" );
-    return 0;
-}
-#else
-
 #include "prio.h"
 #include "prenv.h"
 #include "prmem.h"
@@ -45,6 +36,10 @@ int main()
 #define HOST_BUFFER 1024
 #define PROTO_BUFFER 1500
 
+#define NETADDR_SIZE(addr) \
+    (PR_AF_INET == (addr)->raw.family ? \
+    sizeof((addr)->inet) : sizeof((addr)->ipv6))
+
 static PRFileDesc *err = NULL;
 
 static void Help(void)
@@ -59,7 +54,7 @@ static void DumpAddr(const PRNetAddr* address, const char *msg)
 {
     PRUint32 *word = (PRUint32*)address;
     PRUint32 addr_len = sizeof(PRNetAddr);
-    PR_fprintf(err, "%s[%d]\t", msg, PR_NETADDR_SIZE(address));
+    PR_fprintf(err, "%s[%d]\t", msg, NETADDR_SIZE(address));
     while (addr_len > 0)
     {
         PR_fprintf(err, " %08x", *word++);
@@ -73,7 +68,6 @@ static PRStatus PrintAddress(const PRNetAddr* address)
     PRNetAddr translation;
     char buffer[ADDR_BUFFER];
     PRStatus rv = PR_NetAddrToString(address, buffer, sizeof(buffer));
-    memset(&translation, 0, sizeof(PRNetAddr));
     if (PR_FAILURE == rv) PL_FPrintError(err, "PR_NetAddrToString");
     else
     {
@@ -83,7 +77,7 @@ static PRStatus PrintAddress(const PRNetAddr* address)
         if (PR_FAILURE == rv) PL_FPrintError(err, "PR_StringToNetAddr");
         else
         {
-            PRSize addr_len = PR_NETADDR_SIZE(address);
+            PRSize addr_len = NETADDR_SIZE(address);
             if (0 != memcmp(address, &translation, addr_len))
             {
                 PR_fprintf(err, "Address translations do not match\n");
@@ -102,7 +96,6 @@ PRIntn main(PRIntn argc, char **argv)
     PLOptStatus os;
     PRHostEnt host;
     PRProtoEnt proto;
-    PRBool ipv6 = PR_FALSE;
     const char *name = NULL;
     PRBool failed = PR_FALSE, version = PR_FALSE;
     PLOptState *opt = PL_CreateOptState(argc, argv, "Vh");
@@ -130,12 +123,10 @@ PRIntn main(PRIntn argc, char **argv)
 
     if (version)
     {
-#if defined(XP_UNIX) || defined(XP_OS2)
-#define NSPR_LIB "nspr21"
-#elif defined(WIN32)
-#define NSPR_LIB "libnspr21"
+#if defined(WINNT)
+#define NSPR_LIB "libnspr4"
 #else
-#error "Architecture not supported"
+#define NSPR_LIB "nspr4"
 #endif
         const PRVersionDescription *version_info;
         char *nspr_path = PR_GetEnv("LD_LIBRARY_PATH");
@@ -236,5 +227,3 @@ PRIntn main(PRIntn argc, char **argv)
 
     return (failed) ? 1 : 0;
 }
-
-#endif /* XP_BEOS */
diff --git a/pr/tests/tpd.c b/pr/tests/tpd.c
index 62166937..42180949 100644
--- a/pr/tests/tpd.c
+++ b/pr/tests/tpd.c
@@ -109,7 +109,6 @@ static void PR_CALLBACK Thread(void *null)
     }
     PrintProgress(__LINE__);
 
-#if !defined(DEBUG)
     did = should = PR_FALSE;
     for (keys = 4; keys < 8; ++keys)
     {
@@ -117,7 +116,6 @@ static void PR_CALLBACK Thread(void *null)
         MY_ASSERT(PR_FAILURE == rv);
     }
     PrintProgress(__LINE__);
-#endif
     
     did = PR_FALSE; should = PR_TRUE;
     for (keys = 0; keys < 4; ++keys)
@@ -214,7 +212,8 @@ static PRIntn PR_CALLBACK Tpd(PRIntn argc, char **argv)
     }
     PrintProgress(__LINE__);
 
-#if !defined(DEBUG)
+    for (keys = 4; keys < 8; ++keys)
+		key[keys] = 4096;		/* set to invalid value */
     did = should = PR_FALSE;
     for (keys = 4; keys < 8; ++keys)
     {
@@ -222,7 +221,6 @@ static PRIntn PR_CALLBACK Tpd(PRIntn argc, char **argv)
         MY_ASSERT(PR_FAILURE == rv);
     }
     PrintProgress(__LINE__);
-#endif
     
     did = PR_FALSE; should = PR_TRUE;
     for (keys = 0; keys < 4; ++keys)