update NSPR to 4.24 and keep NSPR Bug 1586070 and win64 patch intact.

This commit is contained in:
Roy Tam 2020-01-03 13:34:04 +08:00
commit 0b9855b841
487 changed files with 42933 additions and 48679 deletions

View file

@ -21,26 +21,28 @@ int main(int argc, char **argv)
PRLibrary *runtime = NULL;
const char *library_name = NULL;
const PRVersionDescription *version_info;
char buffer[100];
PRExplodedTime exploded;
char buffer[100];
PRExplodedTime exploded;
PLOptState *opt = PL_CreateOptState(argc, argv, "d");
PRFileDesc *err = PR_GetSpecialFD(PR_StandardError);
while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
{
if (PL_OPT_BAD == os) continue;
if (PL_OPT_BAD == os) {
continue;
}
switch (opt->option)
{
case 0: /* fully qualified library name */
library_name = opt->value;
break;
case 'd': /* verbodity */
verbosity += 1;
break;
default:
PR_fprintf(err, "Usage: version [-d] {fully qualified library name}\n");
return 2; /* but not a lot else */
case 0: /* fully qualified library name */
library_name = opt->value;
break;
case 'd': /* verbodity */
verbosity += 1;
break;
default:
PR_fprintf(err, "Usage: version [-d] {fully qualified library name}\n");
return 2; /* but not a lot else */
}
}
PL_DestroyOptState(opt);
@ -49,42 +51,43 @@ int main(int argc, char **argv)
{
runtime = PR_LoadLibrary(library_name);
if (NULL == runtime) {
PL_FPrintError(err, "PR_LoadLibrary");
return 3;
} else {
PL_FPrintError(err, "PR_LoadLibrary");
return 3;
} else {
versionEntryPointType versionPoint = (versionEntryPointType)
PR_FindSymbol(runtime, "libVersionPoint");
PR_FindSymbol(runtime, "libVersionPoint");
if (NULL == versionPoint) {
PL_FPrintError(err, "PR_FindSymbol");
return 4;
}
version_info = versionPoint();
}
} else
version_info = libVersionPoint(); /* NSPR's version info */
PL_FPrintError(err, "PR_FindSymbol");
return 4;
}
version_info = versionPoint();
}
} else {
version_info = libVersionPoint(); /* NSPR's version info */
}
(void)PR_fprintf(err, "Runtime library version information\n");
PR_ExplodeTime(
version_info->buildTime, PR_GMTParameters, &exploded);
(void)PR_FormatTime(
buffer, sizeof(buffer), "%d %b %Y %H:%M:%S", &exploded);
(void)PR_fprintf(err, " Build time: %s GMT\n", buffer);
(void)PR_fprintf(
err, " Build time: %s\n", version_info->buildTimeString);
(void)PR_fprintf(
err, " %s V%u.%u.%u (%s%s%s)\n",
version_info->description,
version_info->vMajor,
version_info->vMinor,
version_info->vPatch,
(version_info->beta ? " beta " : ""),
(version_info->debug ? " debug " : ""),
(version_info->special ? " special" : ""));
(void)PR_fprintf(err, " filename: %s\n", version_info->filename);
(void)PR_fprintf(err, " security: %s\n", version_info->security);
(void)PR_fprintf(err, " copyright: %s\n", version_info->copyright);
(void)PR_fprintf(err, " comment: %s\n", version_info->comment);
rv = 0;
(void)PR_fprintf(err, "Runtime library version information\n");
PR_ExplodeTime(
version_info->buildTime, PR_GMTParameters, &exploded);
(void)PR_FormatTime(
buffer, sizeof(buffer), "%d %b %Y %H:%M:%S", &exploded);
(void)PR_fprintf(err, " Build time: %s GMT\n", buffer);
(void)PR_fprintf(
err, " Build time: %s\n", version_info->buildTimeString);
(void)PR_fprintf(
err, " %s V%u.%u.%u (%s%s%s)\n",
version_info->description,
version_info->vMajor,
version_info->vMinor,
version_info->vPatch,
(version_info->beta ? " beta " : ""),
(version_info->debug ? " debug " : ""),
(version_info->special ? " special" : ""));
(void)PR_fprintf(err, " filename: %s\n", version_info->filename);
(void)PR_fprintf(err, " security: %s\n", version_info->security);
(void)PR_fprintf(err, " copyright: %s\n", version_info->copyright);
(void)PR_fprintf(err, " comment: %s\n", version_info->comment);
rv = 0;
return rv;
}