Commit c1637a52 authored by Kai Engert's avatar Kai Engert
Browse files

Bug 1586867 - Upgrade Firefox 71 to use NSPR 4.23. r=jcj NSPR_4_23_BETA1 UPGRADE_NSPR_RELEASE 

Differential Revision: https://phabricator.services.mozilla.com/D48414

--HG--
extra : moz-landing-system : lando
parent bfb06230

nsprpub/TAG-INFO

+1 −1
Original line number Diff line number Diff line 
NSPR_4_22_RTM
 
NSPR_4_23_BETA1
 
 No newline at end of file

nsprpub/config/nsinstall.c

+285 −247
Original line number Diff line number Diff line
@@ -70,8 +70,9 @@ mkdirs(char *path, mode_t mode) 
    struct stat sb;

    int res;



    while (*path == '/' && path[1] == '/')

    while (*path == '/' && path[1] == '/') {

        path++;

    }

    for (cp = strrchr(path, '/'); cp && cp != path && cp[-1] == '/'; cp--)

        ;

    if (cp && cp != path) {
@@ -83,11 +84,13 @@ mkdirs(char *path, mode_t mode) 
        *cp = '/';

    }

    res = mkdir(path, mode);

    if ((res != 0) && (errno == EEXIST))

    if ((res != 0) && (errno == EEXIST)) {

        return 0;

     else

    }

    else {

        return res;

    }

}



static uid_t

touid(char *owner)
@@ -97,11 +100,13 @@ touid(char *owner) 
    char *cp;



    pw = getpwnam(owner);

    if (pw)

    if (pw) {

        return pw->pw_uid;

    }

    uid = strtol(owner, &cp, 0);

    if (uid == 0 && cp == owner)

    if (uid == 0 && cp == owner) {

        fail("cannot find uid for %s", owner);

    }

    return uid;

}
@@ -113,11 +118,13 @@ togid(char *group) 
    char *cp;



    gr = getgrnam(group);

    if (gr)

    if (gr) {

        return gr->gr_gid;

    }

    gid = strtol(group, &cp, 0);

    if (gid == 0 && cp == group)

    if (gid == 0 && cp == group) {

        fail("cannot find gid for %s", group);

    }

    return gid;

}
@@ -160,8 +167,9 @@ main(int argc, char **argv) 
                break;

            case 'm':

                mode = strtoul(optarg, &cp, 8);

	    if (mode == 0 && cp == optarg)

                if (mode == 0 && cp == optarg) {

                    usage();

                }

                break;

            case 'o':

                owner = optarg;
@@ -179,16 +187,18 @@ main(int argc, char **argv) 


    argc -= optind;

    argv += optind;

    if (argc < 2 - onlydir)

    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);

    }

    if (onlydir)

    if (onlydir) {

        return 0;

    }



    if (!cwd) {

#ifdef GETCWD_CAN_MALLOC
@@ -226,10 +236,12 @@ main(int argc, char **argv) 
                (void) unlink(toname);

                exists = 0;

            }

	    if (!exists && mkdir(toname, mode) < 0)

            if (!exists && mkdir(toname, mode) < 0) {

                fail("cannot make directory %s", toname);

	    if ((owner || group) && chown(toname, uid, gid) < 0)

            }

            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 */
@@ -267,11 +279,13 @@ main(int argc, char **argv) 
                (void) (S_ISDIR(tosb.st_mode) ? rmdir : unlink)(toname);

                exists = 0;

            }

	    if (!exists && symlink(name, toname) < 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)

            if ((owner || group) && lchown(toname, uid, gid) < 0) {

                fail("cannot change owner of %s", toname);

            }

#endif



            if (linkname) {
@@ -281,47 +295,57 @@ main(int argc, char **argv) 
        } else {

            /* Copy from name to toname, which might be the same file. */

            fromfd = open(name, O_RDONLY);

	    if (fromfd < 0 || fstat(fromfd, &sb) < 0)

            if (fromfd < 0 || fstat(fromfd, &sb) < 0) {

                fail("cannot access %s", name);

	    if (exists && (!S_ISREG(tosb.st_mode) || access(toname, W_OK) < 0))

            }

            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)

            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)

                    if ((cc -= wc) == 0) {

                        break;

                    }

                    bp += wc;

                }

		if (wc < 0)

                if (wc < 0) {

                    fail("cannot write to %s", toname);

                }

	    if (cc < 0)

            }

            if (cc < 0) {

                fail("cannot read from %s", name);

            }



	    if (ftruncate(tofd, sb.st_size) < 0)

            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)

                if (utime(toname, &utb) < 0) {

                    fail("cannot set times of %s", toname);

                }

            }

#ifdef HAVE_FCHMOD

            if (fchmod(tofd, mode) < 0)

#else

            if (chmod(toname, mode) < 0)

#endif

                fail("cannot change mode of %s", toname);

	    if ((owner || group) && fchown(tofd, uid, gid) < 0)

            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)

            if (close(tofd) < 0) {

                fail("cannot write to %s", toname);

            }

            close(fromfd);

        }
@@ -372,8 +396,9 @@ fail(char *format, ...) 
char *

getcomponent(char *path, char *name)

{

    if (*path == '\0')

    if (*path == '\0') {

        return 0;

    }

    if (*path == '/') {

        *name++ = '/';

    } else {
@@ -382,8 +407,9 @@ getcomponent(char *path, char *name) 
        } while (*path != '/' && *path != '\0');

    }

    *name = '\0';

    while (*path == '/')

    while (*path == '/') {

        path++;

    }

    return path;

}
@@ -410,14 +436,17 @@ ino2name(ino_t ino, char *dir) 
    char *name;



    dp = opendir("..");

    if (!dp)

    if (!dp) {

        fail("cannot read parent directory");

    }

    for (;;) {

	if (!(ep = readdir(dp)))

        if (!(ep = readdir(dp))) {

            fail("cannot find current directory");

	if (ep->d_ino == ino)

        }

        if (ep->d_ino == ino) {

            break;

        }

    }

    name = xstrdup(ep->d_name);

    closedir(dp);

    return name;
@@ -427,8 +456,9 @@ void * 
xmalloc(size_t size)

{

    void *p = malloc(size);

    if (!p)

    if (!p) {

        fail("cannot allocate %u bytes", size);

    }

    return p;

}
@@ -443,18 +473,22 @@ xbasename(char *path) 
{

    char *cp;



    while ((cp = strrchr(path, '/')) && cp[1] == '\0')

    while ((cp = strrchr(path, '/')) && cp[1] == '\0') {

        *cp = '\0';

    if (!cp) return path;

    }

    if (!cp) {

        return path;

    }

    return cp + 1;

}



void

xchdir(char *dir)

{

    if (chdir(dir) < 0)

    if (chdir(dir) < 0) {

        fail("cannot change directory to %s", dir);

    }

}



int

relatepaths(char *from, char *to, char *outpath)
@@ -465,10 +499,12 @@ relatepaths(char *from, char *to, char *outpath) 


    assert(*from == '/' && *to == '/');

    for (cp = to, cp2 = from; *cp == *cp2; cp++, cp2++)

	if (*cp == '\0')

        if (*cp == '\0') {

            break;

    while (cp[-1] != '/')

        }

    while (cp[-1] != '/') {

        cp--, cp2--;

    }

    if (cp - 1 == to) {

        /* closest common ancestor is /, so use full pathname */

        len = strlen(strcpy(outpath, to));
@@ -500,11 +536,13 @@ 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)

        if (strcmp(buf, ".") == 0) {

            continue;

        }

        if (strcmp(buf, "..") == 0) {

	    if (stat(".", &sb) < 0)

            if (stat(".", &sb) < 0) {

                fail("cannot stat current directory");

            }

            name = ino2name(sb.st_ino, "..");

            len = strlen(name);

            cp -= len + 1;

nsprpub/config/prdepend.h

+0 −1
Original line number Diff line number Diff line
@@ -10,4 +10,3 @@ 
 */



#error "Do not include this header file."

nsprpub/configure

+1 −1
Original line number Diff line number Diff line
@@ -2486,7 +2486,7 @@ test -n "$target_alias" && 
  program_prefix=${target_alias}-



MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=22

MOD_MINOR_VERSION=23

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=

nsprpub/configure.in

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ dnl ======================================================== 
dnl = Defaults

dnl ========================================================

MOD_MAJOR_VERSION=4

MOD_MINOR_VERSION=22

MOD_MINOR_VERSION=23

MOD_PATCH_VERSION=0

NSPR_MODNAME=nspr20

_HAVE_PTHREADS=