Another update of the latest stuff from the internal CVS repository /m/src.

20 files changed, 251 insertions, 151 deletions

diff --git a/Makefile b/Makefile
index dca58fb7..f2b883cb 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,7 @@ release::
 	rm -rf META-INF; mkdir META-INF; cd META-INF; \
 	echo "Manifest-Version: 1.0" > MANIFEST.MF; \
 	echo "" >> MANIFEST.MF; \
-	cd ..; rm -f mdbinary.jar; zip -r mdbinary.jar META-INF lib; \
+	cd ..; rm -f mdbinary.jar; zip -r mdbinary.jar META-INF bin lib; \
 	rm -rf META-INF; \
 	cd include; \
 	rm -rf META-INF; mkdir META-INF; cd META-INF; \
diff --git a/config/config.mk b/config/config.mk
index 741cd1a7..10f9e920 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -111,4 +111,5 @@ endif
 RELEASE_DIR = $(NSDEPTH)/dist/release/$(MOD_NAME)
 
 RELEASE_INCLUDE_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/include
+RELEASE_BIN_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/bin
 RELEASE_LIB_DIR = $(RELEASE_DIR)/$(BUILD_NUMBER)/$(OBJDIR_NAME)/lib
diff --git a/config/rules.mk b/config/rules.mk
index fed8e8fb..bded985e 100644
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -190,6 +190,22 @@ realclean clobber_all::
 	+$(LOOP_OVER_DIRS)
 
 release:: export
+ifdef RELEASE_BINS
+	@echo "Copying executable programs and scripts to release directory"
+	@if test -z "$(BUILD_NUMBER)"; then \
+		echo "BUILD_NUMBER must be defined"; \
+		false; \
+	else \
+		true; \
+	fi
+	@if test ! -d $(RELEASE_BIN_DIR); then \
+		rm -rf $(RELEASE_BIN_DIR); \
+		$(NSINSTALL) -D $(RELEASE_BIN_DIR);\
+	else \
+		true; \
+	fi
+	cp $(RELEASE_BINS) $(RELEASE_BIN_DIR)
+endif
 ifdef RELEASE_LIBS
 	@echo "Copying libraries to release directory"
 	@if test -z "$(BUILD_NUMBER)"; then \
diff --git a/lib/libc/src/Makefile b/lib/libc/src/Makefile
index e798782f..cca74076 100644
--- a/lib/libc/src/Makefile
+++ b/lib/libc/src/Makefile
@@ -137,7 +137,7 @@ $(TINC):
 	@$(ECHO) '#define _PRODUCTION "$(PROD)"' >> $(TINC)
 
 
-$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): $(TINC)
+$(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
 ifeq ($(OS_ARCH), WINNT)
 ifdef XP_OS2_EMX
 	$(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c
diff --git a/lib/libc/src/plvrsion.c b/lib/libc/src/plvrsion.c
index 2f803dcf..a7fa2cb2 100644
--- a/lib/libc/src/plvrsion.c
+++ b/lib/libc/src/plvrsion.c
@@ -65,5 +65,15 @@ PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint()
     return &prVersionDescription_libplc21;
 }  /* versionEntryPointType */
 
-/* prvrsion.c */
+#ifdef XP_UNIX
+
+/*
+ * Version information for the 'ident' and 'what commands
+ */
+static char rcsid[] = "$Version: NSPR " PR_VERSION "  " _BUILD_STRING " $";
+static char sccsid[] = "@(#)NSPR " PR_VERSION "  " _BUILD_STRING;
+
+#endif /* XP_UNIX */
+
+/* plvrsion.c */
 
diff --git a/pr/include/MANIFEST b/pr/include/MANIFEST
index 87fd5324..e9d284a4 100644
--- a/pr/include/MANIFEST
+++ b/pr/include/MANIFEST
@@ -13,7 +13,6 @@ prdtoa.h
 prenv.h
 prerr.h
 prerror.h
-prerrorinstall.h
 prinet.h
 prinit.h
 prinrval.h
diff --git a/pr/include/nspr.h b/pr/include/nspr.h
index f385f50e..ae5ab60e 100644
--- a/pr/include/nspr.h
+++ b/pr/include/nspr.h
@@ -27,7 +27,6 @@
 #include "prdtoa.h"
 #include "prenv.h"
 #include "prerror.h"
-#include "prerrorinstall.h"
 #include "prinet.h"
 #include "prinit.h"
 #include "prinrval.h"
diff --git a/pr/include/prerror.h b/pr/include/prerror.h
index eaf87170..54bd5cb9 100644
--- a/pr/include/prerror.h
+++ b/pr/include/prerror.h
@@ -151,6 +151,73 @@ typedef PRUint32 PRLanguageCode;
 #define PR_LANGUAGE_I_DEFAULT 0 /* i-default, the default language */
 #define PR_LANGUAGE_EN 1 /* English, explicitly negotiated */
 
+/*
+ * struct PRErrorMessage --
+ *
+ *    An error message in an error table.
+ */
+struct PRErrorMessage {
+    const char * name;    /* Macro name for error */
+    const char * en_text; /* Default English text */
+};
+
+/*
+ * struct PRErrorTable --
+ *
+ *    An error table, provided by a library.
+ */
+struct PRErrorTable {
+    const struct PRErrorMessage * msgs; /* Array of error information */
+    const char *name; /* Name of error table source */
+    PRErrorCode base; /* Error code for first error in table */
+    int n_msgs; /* Number of codes in table */
+};
+
+/*
+ * struct PRErrorCallbackPrivate --
+ *
+ *    A private structure for the localization plugin 
+ */
+struct PRErrorCallbackPrivate;
+
+/*
+ * struct PRErrorCallbackTablePrivate --
+ *
+ *    A data structure under which the localization plugin may store information,
+ *    associated with an error table, that is private to itself.
+ */
+struct PRErrorCallbackTablePrivate;
+
+/*
+ * PRErrorCallbackLookupFn --
+ *
+ *    A function of PRErrorCallbackLookupFn type is a localization
+ *    plugin callback which converts an error code into a description
+ *    in the requested language.  The callback is provided the
+ *    appropriate error table, private data for the plugin and the table.
+ *    The callback returns the appropriate UTF-8 encoded description, or NULL
+ *    if no description can be found.
+ */
+typedef const char *
+PRErrorCallbackLookupFn(PRErrorCode code, PRLanguageCode language, 
+		   const struct PRErrorTable *table,
+		   struct PRErrorCallbackPrivate *cb_private,
+		   struct PRErrorCallbackTablePrivate *table_private);
+
+/*
+ * PRErrorCallbackNewTableFn --
+ *
+ *    A function PRErrorCallbackNewTableFn type is a localization plugin
+ *    callback which is called once with each error table registered
+ *    with NSPR.  The callback is provided with the error table and
+ *    the plugin's private structure.  The callback returns any table private
+ *    data it wishes to associate with the error table.  Does not need to be thread
+ *    safe.
+ */
+typedef struct PRErrorCallbackTablePrivate *
+PRErrorCallbackNewTableFn(const struct PRErrorTable *table,
+			struct PRErrorCallbackPrivate *cb_private);
+
 /**********************************************************************/
 /****************************** FUNCTIONS *****************************/
 /**********************************************************************/
@@ -193,11 +260,40 @@ PR_EXTERN(const char *) PR_ErrorToName(PRErrorCode code);
 **  with a null pointer.
 **
 ***********************************************************************/
-/*
- * Return the language codes for supported languages.
- */
 PR_EXTERN(const char * const *) PR_ErrorLanguages(void);
 
+
+/***********************************************************************
+** FUNCTION:    PR_ErrorInstallTable
+** DESCRIPTION:
+**  Registers an error table with NSPR.  Must be done exactly once per
+**  table.  Memory pointed to by `table' must remain valid for the life
+**  of the process.
+**
+**  NOT THREAD SAFE!
+**  
+***********************************************************************/
+PR_EXTERN(PRErrorCode) PR_ErrorInstallTable(const struct PRErrorTable *table);
+
+
+/***********************************************************************
+** FUNCTION:    PR_ErrorInstallCallback
+** DESCRIPTION:
+**  Registers an error localization plugin with NSPR.  May be called
+**  at most one time.  `languages' contains the language codes supported
+**  by this plugin.  Languages 0 and 1 must be "i-default" and "en"
+**  respectively.  `lookup' and `newtable' contain pointers to
+**  the plugin callback functions.  `cb_private' contains any information
+**  private to the plugin functions.
+**
+**  NOT THREAD SAFE!
+**
+***********************************************************************/
+PR_EXTERN(void) PR_ErrorInstallCallback(const char * const * languages,
+			      PRErrorCallbackLookupFn *lookup, 
+			      PRErrorCallbackNewTableFn *newtable,
+			      struct PRErrorCallbackPrivate *cb_private);
+
 PR_END_EXTERN_C
 
 #endif /* prerror_h___ */
diff --git a/pr/include/prerrorinstall.h b/pr/include/prerrorinstall.h
deleted file mode 100644
index 2ce2312c..00000000
--- a/pr/include/prerrorinstall.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- * 
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- * 
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-
-#ifndef prerrorinstall_h___
-#define prerrorinstall_h___
-
-#include "prerror.h"
-
-PR_BEGIN_EXTERN_C
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * struct PRErrorMessage --
- *
- *    An error message in an error table.
- */
-struct PRErrorMessage {
-    const char * name;    /* Macro name for error */
-    const char * en_text; /* Default English text */
-};
-
-/*
- * struct PRErrorTable --
- *
- *    An error table, provided by a library.
- */
-struct PRErrorTable {
-    const struct PRErrorMessage * msgs; /* Array of error information */
-
-    const char *name; /* Name of error table source */
-    PRErrorCode base; /* Error code for first error in table */
-    int n_msgs; /* Number of codes in table */
-};
-
-/*
- * struct PRErrorCallbackPrivate --
- *
- *    A private structure for the localization plugin 
- */
-struct PRErrorCallbackPrivate;
-
-/*
- * struct PRErrorCallbackTablePrivate --
- *
- *    A data structure under which the localization plugin may store information,
- *    associated with an error table, that is private to itself.
- */
-struct PRErrorCallbackTablePrivate;
-
-/*
- * PRErrorCallbackLookupFn --
- *
- *    A function of PRErrorCallbackLookupFn type is a localization
- *    plugin callback which converts an error code into a description
- *    in the requested language.  The callback is provided the
- *    appropriate error table, private data for the plugin and the table.
- *    The callback returns the appropriate UTF-8 encoded description, or NULL
- *    if no description can be found.
- */
-typedef const char *
-PRErrorCallbackLookupFn(PRErrorCode code, PRLanguageCode language, 
-		   const struct PRErrorTable *table,
-		   struct PRErrorCallbackPrivate *cb_private,
-		   struct PRErrorCallbackTablePrivate *table_private);
-
-/*
- * PRErrorCallbackNewtableFn --
- *
- *    A function PRErrorCallbackNewtableFn type is a localization plugin
- *    callback which is called once with each error table registered
- *    with NSPR.  The callback is provided with the error table and
- *    the plugin's private structure.  The callback returns any table private
- *    data it wishes to associate with the error table.  Does not need to be thread
- *    safe.
- */
-typedef struct PRErrorCallbackTablePrivate *
-PRErrorCallbackNewtableFn(const struct PRErrorTable *table,
-			struct PRErrorCallbackPrivate *cb_private);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallTable
-** DESCRIPTION:
-**  Registers an error table with NSPR.  Must be done exactly once per
-**  table.  Memory pointed to by `table' must remain valid for the life
-**  of the process.
-**
-**  NOT THREAD SAFE!
-**  
-***********************************************************************/
-PR_EXTERN(PRErrorCode) PR_ErrorInstallTable(const struct PRErrorTable *table);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallCallback
-** DESCRIPTION:
-**  Registers an error localization plugin with NSPR.  May be called
-**  at most one time.  `languages' contains the language codes supported
-**  by this plugin.  Languages 0 and 1 must be "i-default" and "en"
-**  respectively.  `lookup' and `newtable' contain pointers to
-**  the plugin callback functions.  `cb_private' contains any information
-**  private to the plugin functions.
-**
-**  NOT THREAD SAFE!
-**
-***********************************************************************/
-PR_EXTERN(void) PR_ErrorInstallCallback(const char * const * languages,
-			      PRErrorCallbackLookupFn *lookup, 
-			      PRErrorCallbackNewtableFn *newtable,
-			      struct PRErrorCallbackPrivate *cb_private);
-
-PR_END_EXTERN_C
-
-#endif /* prerrorinstall_h___ */
diff --git a/pr/src/misc/Makefile b/pr/src/misc/Makefile
index 48f889b5..2316fcb4 100644
--- a/pr/src/misc/Makefile
+++ b/pr/src/misc/Makefile
@@ -53,6 +53,8 @@ TARGETS	= $(OBJS)
 
 INCLUDES = -I$(DIST)/include/private -I$(DIST)/include
 
+RELEASE_BINS = compile-et.pl prerr.properties
+
 include $(MOD_DEPTH)/config/rules.mk
 
 # An AIX Optimization bug causes PR_dtoa() to produce wrong result.
@@ -63,7 +65,10 @@ $(OBJDIR)/prdtoa.o:
 	$(CC) -o $@ -c $(filter-out -O, $(CFLAGS)) prdtoa.c
 endif
 
-build_prerr : prerr.et
+#
+# Generate prerr.h, prerr.c, and prerr.properties from prerr.et.
+#
+build_prerr:
 	perl compile-et.pl prerr.et
 
 export:: $(TARGETS)
diff --git a/pr/src/misc/compile-et.pl b/pr/src/misc/compile-et.pl
index 7e0eeca9..5c2e4f6c 100644
--- a/pr/src/misc/compile-et.pl
+++ b/pr/src/misc/compile-et.pl
@@ -85,7 +85,7 @@ while ($_ = <INPUT>) {
 	}
 	$table_item_count = 0;
 
-	print C "#include \"prerrorplugin.h\"\n";
+	print C "#include \"prerror.h\"\n";
 	print C "static const struct PRErrorMessage text[] = {\n";
     }
     elsif (/^[ \t]*(error_code|ec)[ \t]+([A-Z_0-9]+),[ \t]*$/) {
diff --git a/pr/src/misc/prerr.c b/pr/src/misc/prerr.c
index 532bd55c..ce30f075 100644
--- a/pr/src/misc/prerr.c
+++ b/pr/src/misc/prerr.c
@@ -21,7 +21,7 @@
  * prerr.c
  * This file is automatically generated; please do not edit it.
  */
-#include "prerrorinstall.h"
+#include "prerror.h"
 static const struct PRErrorMessage text[] = {
 	{"PR_OUT_OF_MEMORY_ERROR",    "Memory allocation attempt failed"},
 	{"PR_BAD_DESCRIPTOR_ERROR",    "Invalid file descriptor"},
diff --git a/pr/src/misc/prerr.properties b/pr/src/misc/prerr.properties
new file mode 100644
index 00000000..c2fe3f65
--- /dev/null
+++ b/pr/src/misc/prerr.properties
@@ -0,0 +1,94 @@
+#
+# The contents of this file are subject to the Netscape Public License
+# Version 1.0 (the "NPL"); you may not use this file except in
+# compliance with the NPL.  You may obtain a copy of the NPL at
+# http://www.mozilla.org/NPL/
+# 
+# Software distributed under the NPL is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+# for the specific language governing rights and limitations under the
+# NPL.
+# 
+# The Initial Developer of this code under the NPL is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+# Reserved.
+#
+#
+# prerr.properties
+# This file is automatically generated; please do not edit it.
+PR_OUT_OF_MEMORY_ERROR=Memory allocation attempt failed
+PR_BAD_DESCRIPTOR_ERROR=Invalid file descriptor
+PR_WOULD_BLOCK_ERROR=The operation would have blocked
+PR_ACCESS_FAULT_ERROR=Invalid memory address argument
+PR_INVALID_METHOD_ERROR=Invalid function for file type
+PR_ILLEGAL_ACCESS_ERROR=Invalid memory address argument
+PR_UNKNOWN_ERROR=Some unknown error has occurred
+PR_PENDING_INTERRUPT_ERROR=Operation interrupted by another thread
+PR_NOT_IMPLEMENTED_ERROR=function not implemented
+PR_IO_ERROR=I/O function error
+PR_IO_TIMEOUT_ERROR=I/O operation timed out
+PR_IO_PENDING_ERROR=I/O operation on busy file descriptor
+PR_DIRECTORY_OPEN_ERROR=The directory could not be opened
+PR_INVALID_ARGUMENT_ERROR=Invalid function argument
+PR_ADDRESS_NOT_AVAILABLE_ERROR=Network address not available (in use?)
+PR_ADDRESS_NOT_SUPPORTED_ERROR=Network address type not supported
+PR_IS_CONNECTED_ERROR=Already connected
+PR_BAD_ADDRESS_ERROR=Network address is invalid
+PR_ADDRESS_IN_USE_ERROR=Local Network address is in use
+PR_CONNECT_REFUSED_ERROR=Connection refused by peer
+PR_NETWORK_UNREACHABLE_ERROR=Network address is presently unreachable
+PR_CONNECT_TIMEOUT_ERROR=Connection attempt timed out
+PR_NOT_CONNECTED_ERROR=Network file descriptor is not connected
+PR_LOAD_LIBRARY_ERROR=Failure to load dynamic library
+PR_UNLOAD_LIBRARY_ERROR=Failure to unload dynamic library
+PR_FIND_SYMBOL_ERROR=Symbol not found in any of the loaded dynamic libraries
+PR_INSUFFICIENT_RESOURCES_ERROR=Insufficient system resources
+PR_DIRECTORY_LOOKUP_ERROR=A directory lookup on a network address has failed
+PR_TPD_RANGE_ERROR=Attempt to access a TPD key that is out of range
+PR_PROC_DESC_TABLE_FULL_ERROR=Process open FD table is full
+PR_SYS_DESC_TABLE_FULL_ERROR=System open FD table is full
+PR_NOT_SOCKET_ERROR=Network operation attempted on non-network file descriptor
+PR_NOT_TCP_SOCKET_ERROR=TCP-specific function attempted on a non-TCP file descriptor
+PR_SOCKET_ADDRESS_IS_BOUND_ERROR=TCP file descriptor is already bound
+PR_NO_ACCESS_RIGHTS_ERROR=Access Denied
+PR_OPERATION_NOT_SUPPORTED_ERROR=The requested operation is not supported by the platform
+PR_PROTOCOL_NOT_SUPPORTED_ERROR=The host operating system does not support the protocol requested
+PR_REMOTE_FILE_ERROR=Access to the remote file has been severed
+PR_BUFFER_OVERFLOW_ERROR=The value requested is too large to be stored in the data buffer provided
+PR_CONNECT_RESET_ERROR=TCP connection reset by peer
+PR_RANGE_ERROR=Unused
+PR_DEADLOCK_ERROR=The operation would have deadlocked
+PR_FILE_IS_LOCKED_ERROR=The file is already locked
+PR_FILE_TOO_BIG_ERROR=Write would result in file larger than the system allows
+PR_NO_DEVICE_SPACE_ERROR=The device for storing the file is full
+PR_PIPE_ERROR=Unused
+PR_NO_SEEK_DEVICE_ERROR=Unused
+PR_IS_DIRECTORY_ERROR=Cannot perform a normal file operation on a directory
+PR_LOOP_ERROR=Symbolic link loop
+PR_NAME_TOO_LONG_ERROR=File name is too long
+PR_FILE_NOT_FOUND_ERROR=File not found
+PR_NOT_DIRECTORY_ERROR=Cannot perform directory operation on a normal file
+PR_READ_ONLY_FILESYSTEM_ERROR=Cannot write to a read-only file system
+PR_DIRECTORY_NOT_EMPTY_ERROR=Cannot delete a directory that is not empty
+PR_FILESYSTEM_MOUNTED_ERROR=Cannot delete or rename a file object while the file system is busy
+PR_NOT_SAME_DEVICE_ERROR=Cannot rename a file to a file system on another device
+PR_DIRECTORY_CORRUPTED_ERROR=The directory object in the file system is corrupted
+PR_FILE_EXISTS_ERROR=Cannot create or rename a filename that already exists
+PR_MAX_DIRECTORY_ENTRIES_ERROR=Directory is full.  No additional filenames may be added
+PR_INVALID_DEVICE_STATE_ERROR=The required device was in an invalid state
+PR_DEVICE_IS_LOCKED_ERROR=The device is locked
+PR_NO_MORE_FILES_ERROR=No more entries in the directory
+PR_END_OF_FILE_ERROR=Encountered end of file
+PR_FILE_SEEK_ERROR=Seek error
+PR_FILE_IS_BUSY_ERROR=The file is busy
+PR_RESERVED_ERROR_5935=Reserved Error Code -5935
+PR_IN_PROGRESS_ERROR=Operation is still in progress (probably a non-blocking connect)
+PR_ALREADY_INITIATED_ERROR=Operation has already been initiated (probably a non-blocking connect)
+PR_GROUP_EMPTY_ERROR=The wait group is empty
+PR_INVALID_STATE_ERROR=Object state improper for request
+PR_NETWORK_DOWN_ERROR=Network is down
+PR_SOCKET_SHUTDOWN_ERROR=Socket shutdown
+PR_CONNECT_ABORTED_ERROR=Connection aborted
+PR_HOST_UNREACHABLE_ERROR=Host is unreachable
+PR_MAX_ERROR=Placeholder for the end of the list
diff --git a/pr/src/misc/prerrortable.c b/pr/src/misc/prerrortable.c
index e7439b0b..0cea136f 100644
--- a/pr/src/misc/prerrortable.c
+++ b/pr/src/misc/prerrortable.c
@@ -41,7 +41,6 @@ provided "as is" without express or implied warranty.
 #include <errno.h>
 #include "prmem.h"
 #include "prerror.h"
-#include "prerrorinstall.h"
 
 #define	ERRCODE_RANGE	8	/* # of bits to shift table number */
 #define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
@@ -66,7 +65,7 @@ static const char * const * callback_languages = default_languages;
 /* Callback info */
 static struct PRErrorCallbackPrivate *callback_private = 0;
 static PRErrorCallbackLookupFn *callback_lookup = 0;
-static PRErrorCallbackNewtableFn *callback_newtable = 0;
+static PRErrorCallbackNewTableFn *callback_newtable = 0;
 
 
 static const char char_set[] =
@@ -197,7 +196,7 @@ PR_ErrorInstallTable(const struct PRErrorTable *table)
 PR_IMPLEMENT(void)
 PR_ErrorInstallCallback(const char * const * languages,
 		       PRErrorCallbackLookupFn *lookup, 
-		       PRErrorCallbackNewtableFn *newtable,
+		       PRErrorCallbackNewTableFn *newtable,
 		       struct PRErrorCallbackPrivate *cb_private)
 {
     struct PRErrorTableList *et;
diff --git a/pr/src/prvrsion.c b/pr/src/prvrsion.c
index 285f697b..71315844 100644
--- a/pr/src/prvrsion.c
+++ b/pr/src/prvrsion.c
@@ -65,5 +65,15 @@ PR_IMPLEMENT(const PRVersionDescription*) libVersionPoint(void)
     return &prVersionDescription_libnsrp21;
 }  /* versionEntryPointType */
 
+#ifdef XP_UNIX
+
+/*
+ * Version information for the 'ident' and 'what commands
+ */
+static char rcsid[] = "$Version: NSPR " PR_VERSION "  " _BUILD_STRING " $";
+static char sccsid[] = "@(#)NSPR " PR_VERSION "  " _BUILD_STRING;
+
+#endif /* XP_UNIX */
+
 /* prvrsion.c */
 
diff --git a/pr/tests/Makefile b/pr/tests/Makefile
index 863cca8d..8b391d48 100644
--- a/pr/tests/Makefile
+++ b/pr/tests/Makefile
@@ -459,7 +459,7 @@ else
 endif
 endif
 else
-	$(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
+	$(PURE) $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPR) $(EXTRA_LIBS) -o $@
 endif
 
 endif
diff --git a/pr/tests/nblayer.c b/pr/tests/nblayer.c
index 5b304d2c..9e8e0d39 100644
--- a/pr/tests/nblayer.c
+++ b/pr/tests/nblayer.c
@@ -29,6 +29,7 @@
 #include "prwin16.h"
 
 #include <stdlib.h>
+#include <string.h>
 
 /*
 ** Testing layering of I/O
@@ -304,6 +305,7 @@ static void PR_CALLBACK Server(void *arg)
     if (verbosity > quiet)
         PR_fprintf(logFile, "Server shutting down stack\n");
     rv = PR_Shutdown(service, PR_SHUTDOWN_BOTH); PR_ASSERT(PR_SUCCESS == rv);
+    rv = PR_Close(service); PR_ASSERT(PR_SUCCESS == rv);
 
 }  /* Server */
 
diff --git a/pr/tests/op_filok.c b/pr/tests/op_filok.c
index 680fea20..bf03388c 100644
--- a/pr/tests/op_filok.c
+++ b/pr/tests/op_filok.c
@@ -49,7 +49,7 @@
 #ifdef XP_UNIX
 #define EXISTING_FILENAME "/bin/sh"
 #elif defined(WIN32)
-#define EXISTING_FILENAME "c:/boot.ini"
+#define EXISTING_FILENAME "c:/autoexec.bat"
 #elif defined(OS2)
 #define EXISTING_FILENAME "c:/config.sys"
 #elif defined(BEOS)
diff --git a/pr/tests/runtests.ksh b/pr/tests/runtests.ksh
index 86d61ebd..04853094 100755
--- a/pr/tests/runtests.ksh
+++ b/pr/tests/runtests.ksh
@@ -33,7 +33,6 @@
 #sproc_p	- obsolete; sproc-based tests for Irix
 #io_timeoutk - obsolete; subsumed in io_timeout
 #io_timeoutu - obsolete; subsumed in io_timeout
-#lockfile	- not meaningful; file locks are process-based in Unix
 #prftest1	- obsolete; subsumed by prftest
 #prftest2	- obsolete; subsumed by prftest
 #prselect	- obsolete; PR_Select is obsolete
@@ -78,6 +77,7 @@ cvar
 cvar2
 dlltest
 dtoa
+errcodes
 exit
 fileio
 foreign
@@ -99,6 +99,7 @@ layer
 lazyinit
 lltest
 lock
+lockfile
 logger
 many_cv
 multiwait
@@ -147,6 +148,7 @@ timemac
 timetest
 tpd
 udpsrv
+vercheck
 version
 writev
 xnotify"
diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c
index c16d7116..cf39cf23 100644
--- a/pr/tests/vercheck.c
+++ b/pr/tests/vercheck.c
@@ -30,6 +30,7 @@
 #include "prinit.h"
 
 #include <stdio.h>
+#include <stdlib.h>
 
 /*
  * This release (3.1) is backward compatible with all