Updated displayed copyright notice. Added compiled-vs-linked version

test.  Added (commented out) enabling of kNuValueMaskDataless.
This commit is contained in:
Andy McFadden 2003-01-10 22:41:20 +00:00
parent 5c0f57cf71
commit cd2b892b07
3 changed files with 25 additions and 1 deletions

View File

@ -840,6 +840,12 @@ OpenArchiveReadOnly(NulibState* pState)
err = NuSetValue(pArchive, kNuValueMimicSHK, true); err = NuSetValue(pArchive, kNuValueMimicSHK, true);
BailError(err); BailError(err);
/*
DBUG(("--- enabling 'mask threadless' mode\n"));
err = NuSetValue(pArchive, kNuValueMaskDataless, true);
BailError(err);
*/
if (strcmp(SYSTEM_DEFAULT_EOL, "\r") == 0) if (strcmp(SYSTEM_DEFAULT_EOL, "\r") == 0)
err = NuSetValue(pArchive, kNuValueEOL, kNuEOLCR); err = NuSetValue(pArchive, kNuValueEOL, kNuEOLCR);
else if (strcmp(SYSTEM_DEFAULT_EOL, "\n") == 0) else if (strcmp(SYSTEM_DEFAULT_EOL, "\n") == 0)

View File

@ -1,3 +1,9 @@
2003/01/10 fadden
- Check NufxLib "compiled" version against "linked" version.
2002/12/06 fadden
- Made minor changes to allow linking NufxLib in as a DLL.
2002/10/20 ***** v1.1.0 shipped ***** 2002/10/20 ***** v1.1.0 shipped *****
2002/10/10 fadden 2002/10/10 fadden

View File

@ -149,8 +149,9 @@ Usage(const NulibState* pState)
printf("\nNulib2 v%s, linked with NufxLib v%ld.%ld.%ld [%s]\n", printf("\nNulib2 v%s, linked with NufxLib v%ld.%ld.%ld [%s]\n",
NState_GetProgramVersion(pState), NState_GetProgramVersion(pState),
majorVersion, minorVersion, bugVersion, nufxLibFlags); majorVersion, minorVersion, bugVersion, nufxLibFlags);
printf("Copyright (C) 2000-2003 by Andy McFadden. All Rights Reserved.\n");
printf("This software is distributed under terms of the GNU General Public License.\n"); printf("This software is distributed under terms of the GNU General Public License.\n");
printf("Written by Andy McFadden. See http://www.nulib.com/ for source and docs.\n\n"); printf("See http://www.nulib.com/ for source code and documentation.\n\n");
printf("Usage: %s -command[modifiers] archive [filename-list]\n\n", printf("Usage: %s -command[modifiers] archive [filename-list]\n\n",
gProgName); gProgName);
printf( printf(
@ -251,6 +252,7 @@ DoHelp(const NulibState* pState)
printf("%s", printf("%s",
"\n" "\n"
"Copyright (C) 2000-2003 by Andy McFadden. All Rights Reserved.\n\n"
"NuLib2 is free software, distributed under terms of the GNU General\n" "NuLib2 is free software, distributed under terms of the GNU General\n"
"Public License. NuLib2 uses NufxLib, a complete library of functions\n" "Public License. NuLib2 uses NufxLib, a complete library of functions\n"
"for accessing NuFX (ShrinkIt) archives. NufxLib is also free software,\n" "for accessing NuFX (ShrinkIt) archives. NufxLib is also free software,\n"
@ -562,8 +564,18 @@ int
main(int argc, char** argv) main(int argc, char** argv)
{ {
NulibState* pState = nil; NulibState* pState = nil;
long majorVersion, minorVersion, bugVersion;
int result = 0; int result = 0;
(void) NuGetVersion(&majorVersion, &minorVersion, &bugVersion, nil, nil);
if (majorVersion != kNuVersionMajor || minorVersion < kNuVersionMinor) {
fprintf(stderr, "ERROR: wrong version of NufxLib --"
" wanted %d.%d.x, got %ld.%ld.%ld.\n",
kNuVersionMajor, kNuVersionMinor,
majorVersion, minorVersion, bugVersion);
goto bail;
}
#if 0 #if 0
extern NuResult ErrorMessageHandler(NuArchive* pArchive, extern NuResult ErrorMessageHandler(NuArchive* pArchive,
void* vErrorMessage); void* vErrorMessage);