Issue #1338 - Part 1: Update NSPR to 4.24

5 files changed, 294 insertions, 273 deletions

diff --git a/nsprpub/config/Makefile.in b/nsprpub/config/Makefile.in
index 7062c5ca9..7c6c815de 100644
--- a/nsprpub/config/Makefile.in
+++ b/nsprpub/config/Makefile.in
@@ -48,22 +48,6 @@ ifeq (,$(filter-out QNX SCOOS UNIXWARE,$(OS_ARCH)))
 DEFINES += -DOMIT_LIB_BUILD_TIME
 endif
 
-ifeq ($(OS_ARCH), IRIX)
-    ifeq ($(basename $(OS_RELEASE)),6)
-        ifndef NS_USE_GCC
-            ifeq ($(USE_N32),1)
-                XLDOPTS += -n32 -Wl,-woff,85
-            else
-                ifeq ($(USE_64),1)
-                    XLDOPTS += -64
-                else
-                    XLDOPTS += -32
-                endif
-            endif
-        endif
-    endif
-endif
-
 ifeq ($(OS_ARCH), HP-UX)
     ifeq ($(USE_64),1)
         XLDOPTS += +DD64
@@ -81,7 +65,7 @@ PROGS	= $(OBJDIR)/now$(PROG_SUFFIX)
 ifeq (,$(CROSS_COMPILE)$(filter-out OS2 WINNT,$(OS_ARCH)))
 TARGETS = $(PROGS)
 else
-ifeq (,$(filter-out SYMBIAN WINCE,$(OS_ARCH)))
+ifeq (,$(filter-out WINCE,$(OS_ARCH)))
 TARGETS = $(PROGS)
 else
 PROGS	+= $(OBJDIR)/nsinstall$(PROG_SUFFIX)
diff --git a/nsprpub/config/autoconf.mk.in b/nsprpub/config/autoconf.mk.in
index 8c9a43aa1..08a1024ad 100644
--- a/nsprpub/config/autoconf.mk.in
+++ b/nsprpub/config/autoconf.mk.in
@@ -140,7 +140,6 @@ endif
 
 MACOS_SDK_DIR	= @MACOS_SDK_DIR@
 
-SYMBIAN_SDK_DIR = @SYMBIAN_SDK_DIR@
 
 NEXT_ROOT	= @NEXT_ROOT@
 ifdef NEXT_ROOT
diff --git a/nsprpub/config/libc_r.h b/nsprpub/config/libc_r.h
index 8f144e355..2af8f2efa 100644
--- a/nsprpub/config/libc_r.h
+++ b/nsprpub/config/libc_r.h
@@ -25,7 +25,7 @@
 #define R_STRTOK_INIT_R() \
     char *r_strtok_r=NULL
 
-#define R_STRTOK_R(return,source,delim) \     
+#define R_STRTOK_R(return,source,delim) \
     return=strtok_r(source,delim,&r_strtok_r)
 
 #define R_STRTOK_NORET_R(source,delim) \
@@ -68,14 +68,14 @@
 
 #define R_LOCALTIME_R(val) \
    localtime_r(val,&r_localtime_r)
-    
+
 /***********/
 /*  crypt  */
 /***********/
 #include <crypt.h>
 #define R_CRYPT_INIT_R() \
     CRYPTD r_cryptd_r; \
-    bzero(&r_cryptd_r,sizeof(CRYPTD)) 
+    bzero(&r_cryptd_r,sizeof(CRYPTD))
 
 #define R_CRYPT_R(pass,salt) \
     crypt_r(pass,salt,&r_cryptd_r)
diff --git a/nsprpub/config/nsinstall.c b/nsprpub/config/nsinstall.c
index f1d2cff26..ee6a11155 100644
--- a/nsprpub/config/nsinstall.c
+++ b/nsprpub/config/nsinstall.c
@@ -30,9 +30,6 @@
 
 #define HAVE_FCHMOD
 
-#if defined(BEOS)
-#undef HAVE_FCHMOD
-#endif
 
 /*
  * Does getcwd() take NULL as the first argument and malloc
@@ -42,13 +39,13 @@
 #define GETCWD_CAN_MALLOC
 #endif
 
-#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__) 
+#if defined(LINUX) || defined(__GNU__) || defined(__GLIBC__)
 #include <getopt.h>
 #endif
 
 #if defined(SCO) || defined(UNIXWARE)
 #if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(a)	(((a) & S_IFMT) == S_IFLNK)
+#define S_ISLNK(a)  (((a) & S_IFMT) == S_IFLNK)
 #endif
 #endif
 
@@ -60,9 +57,9 @@ static void
 usage(void)
 {
     fprintf(stderr,
-	"usage: %s [-C cwd] [-L linkprefix] [-m mode] [-o owner] [-g group]\n"
-	"       %*s [-DdltR] file [file ...] directory\n",
-	program, (int)strlen(program), "");
+            "usage: %s [-C cwd] [-L linkprefix] [-m mode] [-o owner] [-g group]\n"
+            "       %*s [-DdltR] file [file ...] directory\n",
+            program, (int)strlen(program), "");
     exit(2);
 }
 
@@ -72,24 +69,27 @@ mkdirs(char *path, mode_t mode)
     char *cp;
     struct stat sb;
     int res;
-    
-    while (*path == '/' && path[1] == '/')
-	path++;
+
+    while (*path == '/' && path[1] == '/') {
+        path++;
+    }
     for (cp = strrchr(path, '/'); cp && cp != path && cp[-1] == '/'; cp--)
-	;
+        ;
     if (cp && cp != path) {
-	*cp = '\0';
-	if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
-	    mkdirs(path, mode) < 0) {
-	    return -1;
-	}
-	*cp = '/';
+        *cp = '\0';
+        if ((stat(path, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
+            mkdirs(path, mode) < 0) {
+            return -1;
+        }
+        *cp = '/';
     }
     res = mkdir(path, mode);
-    if ((res != 0) && (errno == EEXIST))
-	return 0;
-     else
-	return res;
+    if ((res != 0) && (errno == EEXIST)) {
+        return 0;
+    }
+    else {
+        return res;
+    }
 }
 
 static uid_t
@@ -100,11 +100,13 @@ touid(char *owner)
     char *cp;
 
     pw = getpwnam(owner);
-    if (pw)
-	return pw->pw_uid;
+    if (pw) {
+        return pw->pw_uid;
+    }
     uid = strtol(owner, &cp, 0);
-    if (uid == 0 && cp == owner)
-	fail("cannot find uid for %s", owner);
+    if (uid == 0 && cp == owner) {
+        fail("cannot find uid for %s", owner);
+    }
     return uid;
 }
 
@@ -116,11 +118,13 @@ togid(char *group)
     char *cp;
 
     gr = getgrnam(group);
-    if (gr)
-	return gr->gr_gid;
+    if (gr) {
+        return gr->gr_gid;
+    }
     gid = strtol(group, &cp, 0);
-    if (gid == 0 && cp == group)
-	fail("cannot find gid for %s", group);
+    if (gid == 0 && cp == group) {
+        fail("cannot find gid for %s", group);
+    }
     return gid;
 }
 
@@ -140,65 +144,68 @@ main(int argc, char **argv)
     onlydir = dodir = dolink = dorelsymlink = dotimes = lplen = 0;
 
     while ((opt = getopt(argc, argv, "C:DdlL:Rm:o:g:t")) != EOF) {
-	switch (opt) {
-	  case 'C':
-	    cwd = optarg;
-	    break;
-	  case 'D':
-	    onlydir = 1;
-	    break;
-	  case 'd':
-	    dodir = 1;
-	    break;
-	  case 'l':
-	    dolink = 1;
-	    break;
-	  case 'L':
-	    linkprefix = optarg;
-	    lplen = strlen(linkprefix);
-	    dolink = 1;
-	    break;
-	  case 'R':
-	    dolink = dorelsymlink = 1;
-	    break;
-	  case 'm':
-	    mode = strtoul(optarg, &cp, 8);
-	    if (mode == 0 && cp == optarg)
-		usage();
-	    break;
-	  case 'o':
-	    owner = optarg;
-	    break;
-	  case 'g':
-	    group = optarg;
-	    break;
-	  case 't':
-	    dotimes = 1;
-	    break;
-	  default:
-	    usage();
-	}
+        switch (opt) {
+            case 'C':
+                cwd = optarg;
+                break;
+            case 'D':
+                onlydir = 1;
+                break;
+            case 'd':
+                dodir = 1;
+                break;
+            case 'l':
+                dolink = 1;
+                break;
+            case 'L':
+                linkprefix = optarg;
+                lplen = strlen(linkprefix);
+                dolink = 1;
+                break;
+            case 'R':
+                dolink = dorelsymlink = 1;
+                break;
+            case 'm':
+                mode = strtoul(optarg, &cp, 8);
+                if (mode == 0 && cp == optarg) {
+                    usage();
+                }
+                break;
+            case 'o':
+                owner = optarg;
+                break;
+            case 'g':
+                group = optarg;
+                break;
+            case 't':
+                dotimes = 1;
+                break;
+            default:
+                usage();
+        }
     }
 
     argc -= optind;
     argv += optind;
-    if (argc < 2 - onlydir)
-	usage();
+    if (argc < 2 - onlydir) {
+        usage();
+    }
 
     todir = argv[argc-1];
     if ((stat(todir, &sb) < 0 || !S_ISDIR(sb.st_mode)) &&
-	mkdirs(todir, 0777) < 0) {
-	fail("cannot make directory %s", todir);
+        mkdirs(todir, 0777) < 0) {
+        fail("cannot make directory %s", todir);
+    }
+    if (onlydir) {
+        return 0;
     }
-    if (onlydir)
-	return 0;
 
     if (!cwd) {
 #ifdef GETCWD_CAN_MALLOC
-	cwd = getcwd(0, PATH_MAX);
+        cwd = getcwd(0, PATH_MAX);
 #else
-	cwd = malloc(PATH_MAX + 1);
-	cwd = getcwd(cwd, PATH_MAX);
+        cwd = malloc(PATH_MAX + 1);
+        cwd = getcwd(cwd, PATH_MAX);
 #endif
     }
     xchdir(todir);
@@ -215,120 +222,134 @@ main(int argc, char **argv)
     gid = group ? togid(group) : -1;
 
     while (--argc > 0) {
-	name = *argv++;
-	len = strlen(name);
-	base = xbasename(name);
-	bnlen = strlen(base);
-	toname = (char*)xmalloc(tdlen + 1 + bnlen + 1);
-	sprintf(toname, "%s/%s", todir, base);
-	exists = (lstat(toname, &tosb) == 0);
-
-	if (dodir) {
-	    /* -d means create a directory, always */
-	    if (exists && !S_ISDIR(tosb.st_mode)) {
-		(void) unlink(toname);
-		exists = 0;
-	    }
-	    if (!exists && mkdir(toname, mode) < 0)
-		fail("cannot make directory %s", toname);
-	    if ((owner || group) && chown(toname, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
-	} else if (dolink) {
-	    if (*name == '/') {
-		/* source is absolute pathname, link to it directly */
-		linkname = 0;
-	    } else {
-		if (linkprefix) {
-		    /* -L implies -l and prefixes names with a $cwd arg. */
-		    len += lplen + 1;
-		    linkname = (char*)xmalloc(len + 1);
-		    sprintf(linkname, "%s/%s", linkprefix, name);
-		} else if (dorelsymlink) {
-		    /* Symlink the relative path from todir to source name. */
-		    linkname = (char*)xmalloc(PATH_MAX);
-
-		    if (*todir == '/') {
-			/* todir is absolute: skip over common prefix. */
-			lplen = relatepaths(todir, cwd, linkname);
-			strcpy(linkname + lplen, name);
-		    } else {
-			/* todir is named by a relative path: reverse it. */
-			reversepath(todir, name, len, linkname);
-			xchdir(cwd);
-		    }
-
-		    len = strlen(linkname);
-		}
-		name = linkname;
-	    }
-
-	    /* Check for a pre-existing symlink with identical content. */
-	    if (exists &&
-		(!S_ISLNK(tosb.st_mode) ||
-		 readlink(toname, buf, sizeof buf) != len ||
-		 strncmp(buf, name, len) != 0)) {
-		(void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
-		exists = 0;
-	    }
-	    if (!exists && symlink(name, toname) < 0)
-		fail("cannot make symbolic link %s", toname);
+        name = *argv++;
+        len = strlen(name);
+        base = xbasename(name);
+        bnlen = strlen(base);
+        toname = (char*)xmalloc(tdlen + 1 + bnlen + 1);
+        sprintf(toname, "%s/%s", todir, base);
+        exists = (lstat(toname, &tosb) == 0);
+
+        if (dodir) {
+            /* -d means create a directory, always */
+            if (exists && !S_ISDIR(tosb.st_mode)) {
+                (void) unlink(toname);
+                exists = 0;
+            }
+            if (!exists && mkdir(toname, mode) < 0) {
+                fail("cannot make directory %s", toname);
+            }
+            if ((owner || group) && chown(toname, uid, gid) < 0) {
+                fail("cannot change owner of %s", toname);
+            }
+        } else if (dolink) {
+            if (*name == '/') {
+                /* source is absolute pathname, link to it directly */
+                linkname = 0;
+            } else {
+                if (linkprefix) {
+                    /* -L implies -l and prefixes names with a $cwd arg. */
+                    len += lplen + 1;
+                    linkname = (char*)xmalloc(len + 1);
+                    sprintf(linkname, "%s/%s", linkprefix, name);
+                } else if (dorelsymlink) {
+                    /* Symlink the relative path from todir to source name. */
+                    linkname = (char*)xmalloc(PATH_MAX);
+
+                    if (*todir == '/') {
+                        /* todir is absolute: skip over common prefix. */
+                        lplen = relatepaths(todir, cwd, linkname);
+                        strcpy(linkname + lplen, name);
+                    } else {
+                        /* todir is named by a relative path: reverse it. */
+                        reversepath(todir, name, len, linkname);
+                        xchdir(cwd);
+                    }
+
+                    len = strlen(linkname);
+                }
+                name = linkname;
+            }
+
+            /* Check for a pre-existing symlink with identical content. */
+            if (exists &&
+                (!S_ISLNK(tosb.st_mode) ||
+                 readlink(toname, buf, sizeof buf) != len ||
+                 strncmp(buf, name, len) != 0)) {
+                (void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
+                exists = 0;
+            }
+            if (!exists && symlink(name, toname) < 0) {
+                fail("cannot make symbolic link %s", toname);
+            }
 #ifdef HAVE_LCHOWN
-	    if ((owner || group) && lchown(toname, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
+            if ((owner || group) && lchown(toname, uid, gid) < 0) {
+                fail("cannot change owner of %s", toname);
+            }
 #endif
 
-	    if (linkname) {
-		free(linkname);
-		linkname = 0;
-	    }
-	} else {
-	    /* Copy from name to toname, which might be the same file. */
-	    fromfd = open(name, O_RDONLY);
-	    if (fromfd < 0 || fstat(fromfd, &sb) < 0)
-		fail("cannot access %s", name);
-	    if (exists && (!S_ISREG(tosb.st_mode) || access(toname, W_OK) < 0))
-		(void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
-	    tofd = open(toname, O_CREAT | O_WRONLY, 0666);
-	    if (tofd < 0)
-		fail("cannot create %s", toname);
-
-	    bp = buf;
-	    while ((cc = read(fromfd, bp, sizeof buf)) > 0) {
-		while ((wc = write(tofd, bp, cc)) > 0) {
-		    if ((cc -= wc) == 0)
-			break;
-		    bp += wc;
-		}
-		if (wc < 0)
-		    fail("cannot write to %s", toname);
-	    }
-	    if (cc < 0)
-		fail("cannot read from %s", name);
-
-	    if (ftruncate(tofd, sb.st_size) < 0)
-		fail("cannot truncate %s", toname);
-	    if (dotimes) {
-		utb.actime = sb.st_atime;
-		utb.modtime = sb.st_mtime;
-		if (utime(toname, &utb) < 0)
-		    fail("cannot set times of %s", toname);
-	    }
+            if (linkname) {
+                free(linkname);
+                linkname = 0;
+            }
+        } else {
+            /* Copy from name to toname, which might be the same file. */
+            fromfd = open(name, O_RDONLY);
+            if (fromfd < 0 || fstat(fromfd, &sb) < 0) {
+                fail("cannot access %s", name);
+            }
+            if (exists && (!S_ISREG(tosb.st_mode) || access(toname, W_OK) < 0)) {
+                (void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);
+            }
+            tofd = open(toname, O_CREAT | O_WRONLY, 0666);
+            if (tofd < 0) {
+                fail("cannot create %s", toname);
+            }
+
+            bp = buf;
+            while ((cc = read(fromfd, bp, sizeof buf)) > 0) {
+                while ((wc = write(tofd, bp, cc)) > 0) {
+                    if ((cc -= wc) == 0) {
+                        break;
+                    }
+                    bp += wc;
+                }
+                if (wc < 0) {
+                    fail("cannot write to %s", toname);
+                }
+            }
+            if (cc < 0) {
+                fail("cannot read from %s", name);
+            }
+
+            if (ftruncate(tofd, sb.st_size) < 0) {
+                fail("cannot truncate %s", toname);
+            }
+            if (dotimes) {
+                utb.actime = sb.st_atime;
+                utb.modtime = sb.st_mtime;
+                if (utime(toname, &utb) < 0) {
+                    fail("cannot set times of %s", toname);
+                }
+            }
 #ifdef HAVE_FCHMOD
-	    if (fchmod(tofd, mode) < 0)
+            if (fchmod(tofd, mode) < 0)
 #else
-	    if (chmod(toname, mode) < 0)
+            if (chmod(toname, mode) < 0)
 #endif
-		fail("cannot change mode of %s", toname);
-	    if ((owner || group) && fchown(tofd, uid, gid) < 0)
-		fail("cannot change owner of %s", toname);
-
-	    /* Must check for delayed (NFS) write errors on close. */
-	    if (close(tofd) < 0)
-		fail("cannot write to %s", toname);
-	    close(fromfd);
-	}
-
-	free(toname);
+                fail("cannot change mode of %s", toname);
+            if ((owner || group) && fchown(tofd, uid, gid) < 0) {
+                fail("cannot change owner of %s", toname);
+            }
+
+            /* Must check for delayed (NFS) write errors on close. */
+            if (close(tofd) < 0) {
+                fail("cannot write to %s", toname);
+            }
+            close(fromfd);
+        }
+
+        free(toname);
     }
 
     free(cwd);
@@ -362,10 +383,10 @@ fail(char *format, ...)
     if (error)
 
 #ifdef USE_REENTRANT_LIBC
-    R_STRERROR_R(errno);
-	fprintf(stderr, ": %s", r_strerror_r);
+        R_STRERROR_R(errno);
+    fprintf(stderr, ": %s", r_strerror_r);
 #else
-	fprintf(stderr, ": %s", strerror(errno));
+        fprintf(stderr, ": %s", strerror(errno));
 #endif
 
     putc('\n', stderr);
@@ -375,18 +396,20 @@ fail(char *format, ...)
 char *
 getcomponent(char *path, char *name)
 {
-    if (*path == '\0')
-	return 0;
+    if (*path == '\0') {
+        return 0;
+    }
     if (*path == '/') {
-	*name++ = '/';
+        *name++ = '/';
     } else {
-	do {
-	    *name++ = *path++;
-	} while (*path != '/' && *path != '\0');
+        do {
+            *name++ = *path++;
+        } while (*path != '/' && *path != '\0');
     }
     *name = '\0';
-    while (*path == '/')
-	path++;
+    while (*path == '/') {
+        path++;
+    }
     return path;
 }
 
@@ -394,14 +417,14 @@ getcomponent(char *path, char *name)
 /* Sigh.  The static buffer in Unixware's readdir is too small. */
 struct dirent * readdir(DIR *d)
 {
-        static struct dirent *buf = NULL;
+    static struct dirent *buf = NULL;
 #define MAX_PATH_LEN 1024
 
 
-        if(buf == NULL)
-                buf = (struct dirent *) malloc(sizeof(struct dirent) + MAX_PATH_LEN)
-;
-        return(readdir_r(d, buf));
+    if(buf == NULL)
+        buf = (struct dirent *) malloc(sizeof(struct dirent) + MAX_PATH_LEN)
+              ;
+    return(readdir_r(d, buf));
 }
 #endif
 
@@ -413,13 +436,16 @@ ino2name(ino_t ino, char *dir)
     char *name;
 
     dp = opendir("..");
-    if (!dp)
-	fail("cannot read parent directory");
+    if (!dp) {
+        fail("cannot read parent directory");
+    }
     for (;;) {
-	if (!(ep = readdir(dp)))
-	    fail("cannot find current directory");
-	if (ep->d_ino == ino)
-	    break;
+        if (!(ep = readdir(dp))) {
+            fail("cannot find current directory");
+        }
+        if (ep->d_ino == ino) {
+            break;
+        }
     }
     name = xstrdup(ep->d_name);
     closedir(dp);
@@ -430,8 +456,9 @@ void *
 xmalloc(size_t size)
 {
     void *p = malloc(size);
-    if (!p)
-	fail("cannot allocate %u bytes", size);
+    if (!p) {
+        fail("cannot allocate %u bytes", size);
+    }
     return p;
 }
 
@@ -446,17 +473,21 @@ xbasename(char *path)
 {
     char *cp;
 
-    while ((cp = strrchr(path, '/')) && cp[1] == '\0')
-	*cp = '\0';
-    if (!cp) return path;
+    while ((cp = strrchr(path, '/')) && cp[1] == '\0') {
+        *cp = '\0';
+    }
+    if (!cp) {
+        return path;
+    }
     return cp + 1;
 }
 
 void
 xchdir(char *dir)
 {
-    if (chdir(dir) < 0)
-	fail("cannot change directory to %s", dir);
+    if (chdir(dir) < 0) {
+        fail("cannot change directory to %s", dir);
+    }
 }
 
 int
@@ -468,27 +499,29 @@ relatepaths(char *from, char *to, char *outpath)
 
     assert(*from == '/' && *to == '/');
     for (cp = to, cp2 = from; *cp == *cp2; cp++, cp2++)
-	if (*cp == '\0')
-	    break;
-    while (cp[-1] != '/')
-	cp--, cp2--;
+        if (*cp == '\0') {
+            break;
+        }
+    while (cp[-1] != '/') {
+        cp--, cp2--;
+    }
     if (cp - 1 == to) {
-	/* closest common ancestor is /, so use full pathname */
-	len = strlen(strcpy(outpath, to));
-	if (outpath[len] != '/') {
-	    outpath[len++] = '/';
-	    outpath[len] = '\0';
-	}
+        /* closest common ancestor is /, so use full pathname */
+        len = strlen(strcpy(outpath, to));
+        if (outpath[len] != '/') {
+            outpath[len++] = '/';
+            outpath[len] = '\0';
+        }
     } else {
-	len = 0;
-	while ((cp2 = getcomponent(cp2, buf)) != 0) {
-	    strcpy(outpath + len, "../");
-	    len += 3;
-	}
-	while ((cp = getcomponent(cp, buf)) != 0) {
-	    sprintf(outpath + len, "%s/", buf);
-	    len += strlen(outpath + len);
-	}
+        len = 0;
+        while ((cp2 = getcomponent(cp2, buf)) != 0) {
+            strcpy(outpath + len, "../");
+            len += 3;
+        }
+        while ((cp = getcomponent(cp, buf)) != 0) {
+            sprintf(outpath + len, "%s/", buf);
+            len += strlen(outpath + len);
+        }
     }
     return len;
 }
@@ -503,23 +536,25 @@ reversepath(char *inpath, char *name, int len, char *outpath)
     cp = strcpy(outpath + PATH_MAX - (len + 1), name);
     cp2 = inpath;
     while ((cp2 = getcomponent(cp2, buf)) != 0) {
-	if (strcmp(buf, ".") == 0)
-	    continue;
-	if (strcmp(buf, "..") == 0) {
-	    if (stat(".", &sb) < 0)
-		fail("cannot stat current directory");
-	    name = ino2name(sb.st_ino, "..");
-	    len = strlen(name);
-	    cp -= len + 1;
-	    strcpy(cp, name);
-	    cp[len] = '/';
-	    free(name);
-	    xchdir("..");
-	} else {
-	    cp -= 3;
-	    strncpy(cp, "../", 3);
-	    xchdir(buf);
-	}
+        if (strcmp(buf, ".") == 0) {
+            continue;
+        }
+        if (strcmp(buf, "..") == 0) {
+            if (stat(".", &sb) < 0) {
+                fail("cannot stat current directory");
+            }
+            name = ino2name(sb.st_ino, "..");
+            len = strlen(name);
+            cp -= len + 1;
+            strcpy(cp, name);
+            cp[len] = '/';
+            free(name);
+            xchdir("..");
+        } else {
+            cp -= 3;
+            memcpy(cp, "../", 3);
+            xchdir(buf);
+        }
     }
     strcpy(outpath, cp);
 }
diff --git a/nsprpub/config/rules.mk b/nsprpub/config/rules.mk
index 1c8fdc9b8..84dff5617 100644
--- a/nsprpub/config/rules.mk
+++ b/nsprpub/config/rules.mk
@@ -280,10 +280,13 @@ ifdef ENABLE_STRIP
 	$(STRIP) $@
 endif
 
-$(LIBRARY): $(OBJS)
+# Same as OBJS, but without any file that matches p*vrsion.o, since these
+# collide for static libraries, and are not useful for that case anyway.
+STATICLIB_OBJS = $(filter-out $(OBJDIR)/p%vrsion.$(OBJ_SUFFIX),$(OBJS))
+$(LIBRARY): $(STATICLIB_OBJS)
 	@$(MAKE_OBJDIR)
 	rm -f $@
-	$(AR) $(AR_FLAGS) $(OBJS) $(AR_EXTRA_ARGS)
+	$(AR) $(AR_FLAGS) $(STATICLIB_OBJS) $(AR_EXTRA_ARGS)
 	$(RANLIB) $@
 
 ifeq ($(OS_TARGET), OS2)