2000-05-23 01:55:31 +00:00
|
|
|
/*
|
|
|
|
* NuFX archive manipulation library
|
2007-02-19 23:12:22 +00:00
|
|
|
* Copyright (C) 2000-2007 by Andy McFadden, All Rights Reserved.
|
2000-05-23 01:55:31 +00:00
|
|
|
* This is free software; you can redistribute it and/or modify it under the
|
2007-02-19 23:12:22 +00:00
|
|
|
* terms of the BSD License, see the file COPYING-LIB.
|
2000-05-23 01:55:31 +00:00
|
|
|
*
|
|
|
|
* All external entry points.
|
|
|
|
*/
|
|
|
|
#include "NufxLibPriv.h"
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Misc utils
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Set the busy flag.
|
|
|
|
*
|
|
|
|
* The busy flag is intended to prevent the caller from executing illegal
|
|
|
|
* operations while inside a callback function. It is NOT intended to
|
|
|
|
* allow concurrent access to the same archive from multiple threads, so
|
|
|
|
* it does not follow all sorts of crazy semaphore semantics. If you
|
|
|
|
* have the need, go ahead and fix it.
|
|
|
|
*/
|
2014-12-23 00:00:33 +00:00
|
|
|
static inline void Nu_SetBusy(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->busy = true;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Clear the busy flag.
|
|
|
|
*/
|
2014-12-23 00:00:33 +00:00
|
|
|
static inline void Nu_ClearBusy(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->busy = false;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Do a partial validation on NuArchive. Some calls, such as GetExtraData,
|
|
|
|
* can be made during callback functions when the archive isn't fully
|
|
|
|
* consistent.
|
|
|
|
*/
|
2014-12-23 00:00:33 +00:00
|
|
|
static NuError Nu_PartiallyValidateNuArchive(const NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pArchive == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive = pArchive;
|
|
|
|
if (pArchive->structMagic != kNuArchiveStructMagic)
|
|
|
|
return kNuErrBadStruct;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Validate the NuArchive* argument passed in to us.
|
|
|
|
*/
|
2014-12-23 00:00:33 +00:00
|
|
|
static NuError Nu_ValidateNuArchive(const NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
err = Nu_PartiallyValidateNuArchive(pArchive);
|
|
|
|
if (err != kNuErrNone)
|
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
/* explicitly block reentrant calls */
|
|
|
|
if (pArchive->busy)
|
|
|
|
return kNuErrBusy;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
/* make sure the TOC state is consistent */
|
|
|
|
if (pArchive->haveToc) {
|
|
|
|
if (pArchive->masterHeader.mhTotalRecords != 0)
|
2014-12-22 02:17:23 +00:00
|
|
|
Assert(Nu_RecordSet_GetListHead(&pArchive->origRecordSet) != NULL);
|
2002-09-21 00:49:42 +00:00
|
|
|
Assert(Nu_RecordSet_GetNumRecords(&pArchive->origRecordSet) ==
|
|
|
|
pArchive->masterHeader.mhTotalRecords);
|
|
|
|
} else {
|
2014-12-22 02:17:23 +00:00
|
|
|
Assert(Nu_RecordSet_GetListHead(&pArchive->origRecordSet) == NULL);
|
2002-09-21 00:49:42 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
/* make sure we have open files to work with */
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
Assert(pArchive->archivePathnameUNI == NULL || pArchive->archiveFp != NULL);
|
|
|
|
if (pArchive->archivePathnameUNI != NULL && pArchive->archiveFp == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInternal;
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
Assert(pArchive->tmpPathnameUNI == NULL || pArchive->tmpFp != NULL);
|
|
|
|
if (pArchive->tmpPathnameUNI != NULL && pArchive->tmpFp == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInternal;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
/* further validations */
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Streaming and non-streaming read-only
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuStreamOpenRO(FILE* infp, NuArchive** ppArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:17:23 +00:00
|
|
|
if (infp == NULL || ppArchive == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
err = Nu_StreamOpenRO(infp, (NuArchive**) ppArchive);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuContents(NuArchive* pArchive, NuCallback contentFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
if (Nu_IsStreaming(pArchive))
|
|
|
|
err = Nu_StreamContents(pArchive, contentFunc);
|
|
|
|
else
|
|
|
|
err = Nu_Contents(pArchive, contentFunc);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuExtract(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
if (Nu_IsStreaming(pArchive))
|
|
|
|
err = Nu_StreamExtract(pArchive);
|
|
|
|
else
|
|
|
|
err = Nu_Extract(pArchive);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuTest(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
if (Nu_IsStreaming(pArchive))
|
|
|
|
err = Nu_StreamTest(pArchive);
|
|
|
|
else
|
|
|
|
err = Nu_Test(pArchive);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuTestRecord(NuArchive* pArchive, NuRecordIdx recordIdx)
|
2003-02-23 00:31:32 +00:00
|
|
|
{
|
|
|
|
NuError err;
|
|
|
|
|
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_TestRecord(pArchive, recordIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2000-05-23 01:55:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Strictly non-streaming read-only
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuOpenRO(const UNICHAR* archivePathnameUNI,
|
|
|
|
NuArchive** ppArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
err = Nu_OpenRO(archivePathnameUNI, (NuArchive**) ppArchive);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuExtractRecord(NuArchive* pArchive, NuRecordIdx recordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_ExtractRecord(pArchive, recordIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuExtractThread(NuArchive* pArchive, NuThreadIdx threadIdx,
|
2002-09-21 00:49:42 +00:00
|
|
|
NuDataSink* pDataSink)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_ExtractThread(pArchive, threadIdx, pDataSink);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetRecord(NuArchive* pArchive, NuRecordIdx recordIdx,
|
2002-09-21 00:49:42 +00:00
|
|
|
const NuRecord** ppRecord)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_GetRecord(pArchive, recordIdx, ppRecord);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuGetRecordIdxByName(NuArchive* pArchive,
|
|
|
|
const char* nameMOR, NuRecordIdx* pRecordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
err = Nu_GetRecordIdxByName(pArchive, nameMOR, pRecordIdx);
|
2002-09-21 00:49:42 +00:00
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetRecordIdxByPosition(NuArchive* pArchive, uint32_t position,
|
2002-09-21 00:49:42 +00:00
|
|
|
NuRecordIdx* pRecordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_GetRecordIdxByPosition(pArchive, position, pRecordIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Read/Write
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuOpenRW(const UNICHAR* archivePathnameUNI,
|
|
|
|
const UNICHAR* tmpPathnameUNI, uint32_t flags, NuArchive** ppArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
err = Nu_OpenRW(archivePathnameUNI, tmpPathnameUNI, flags,
|
2002-09-21 00:49:42 +00:00
|
|
|
(NuArchive**) ppArchive);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuFlush(NuArchive* pArchive, uint32_t* pStatusFlags)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_Flush(pArchive, pStatusFlags);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuAbort(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_Abort(pArchive);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuAddRecord(NuArchive* pArchive,
|
|
|
|
const NuFileDetails* pFileDetails, NuRecordIdx* pRecordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
2014-12-22 02:17:23 +00:00
|
|
|
err = Nu_AddRecord(pArchive, pFileDetails, pRecordIdx, NULL);
|
2002-09-21 00:49:42 +00:00
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuAddThread(NuArchive* pArchive, NuRecordIdx recordIdx,
|
|
|
|
NuThreadID threadID, NuDataSource* pDataSource, NuThreadIdx* pThreadIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_AddThread(pArchive, recordIdx, threadID,
|
|
|
|
pDataSource, pThreadIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuAddFile(NuArchive* pArchive, const UNICHAR* pathnameUNI,
|
2002-09-21 00:49:42 +00:00
|
|
|
const NuFileDetails* pFileDetails, short isFromRsrcFork,
|
|
|
|
NuRecordIdx* pRecordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
err = Nu_AddFile(pArchive, pathnameUNI, pFileDetails,
|
2002-09-21 00:49:42 +00:00
|
|
|
(Boolean)(isFromRsrcFork != 0), pRecordIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuRename(NuArchive* pArchive, NuRecordIdx recordIdx,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
const char* pathnameMOR, char fssep)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
err = Nu_Rename(pArchive, recordIdx, pathnameMOR, fssep);
|
2002-09-21 00:49:42 +00:00
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuSetRecordAttr(NuArchive* pArchive, NuRecordIdx recordIdx,
|
2002-09-21 00:49:42 +00:00
|
|
|
const NuRecordAttr* pRecordAttr)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_SetRecordAttr(pArchive, recordIdx, pRecordAttr);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuUpdatePresizedThread(NuArchive* pArchive,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NuThreadIdx threadIdx, NuDataSource* pDataSource, int32_t* pMaxLen)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_UpdatePresizedThread(pArchive, threadIdx,
|
|
|
|
pDataSource, pMaxLen);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDelete(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_Delete(pArchive);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDeleteRecord(NuArchive* pArchive, NuRecordIdx recordIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_DeleteRecord(pArchive, recordIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDeleteThread(NuArchive* pArchive, NuThreadIdx threadIdx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_DeleteThread(pArchive, threadIdx);
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* General interfaces
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuClose(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
Nu_SetBusy(pArchive);
|
|
|
|
err = Nu_Close(pArchive);
|
|
|
|
/* on success, pArchive has been freed */
|
|
|
|
if (err != kNuErrNone)
|
|
|
|
Nu_ClearBusy(pArchive);
|
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetMasterHeader(NuArchive* pArchive,
|
|
|
|
const NuMasterHeader** ppMasterHeader)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
err = Nu_GetMasterHeader(pArchive, ppMasterHeader);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetExtraData(NuArchive* pArchive, void** ppData)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:17:23 +00:00
|
|
|
if (ppData == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
|
|
|
if ((err = Nu_PartiallyValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
*ppData = pArchive->extraData;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuSetExtraData(NuArchive* pArchive, void* pData)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_PartiallyValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
pArchive->extraData = pData;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetValue(NuArchive* pArchive, NuValueID ident,
|
|
|
|
NuValue* pValue)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_PartiallyValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
return Nu_GetValue(pArchive, ident, pValue);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuSetValue(NuArchive* pArchive, NuValueID ident,
|
|
|
|
NuValue value)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_PartiallyValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
return Nu_SetValue(pArchive, ident, value);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuGetAttr(NuArchive* pArchive, NuAttrID ident,
|
|
|
|
NuAttr* pAttr)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
if ((err = Nu_PartiallyValidateNuArchive(pArchive)) == kNuErrNone)
|
|
|
|
return Nu_GetAttr(pArchive, ident, pAttr);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return err;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDebugDumpArchive(NuArchive* pArchive)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
|
|
|
#if defined(DEBUG_MSGS)
|
2002-09-21 00:49:42 +00:00
|
|
|
/* skip validation checks for this one */
|
|
|
|
Nu_DebugDumpAll(pArchive);
|
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
#else
|
2002-09-21 00:49:42 +00:00
|
|
|
/* function doesn't exist */
|
|
|
|
return kNuErrGeneric;
|
2000-05-23 01:55:31 +00:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Sources and Sinks
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSourceForFile(NuThreadFormat threadFormat,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
uint32_t otherLen, const UNICHAR* pathnameUNI, short isFromRsrcFork,
|
2002-09-21 00:49:42 +00:00
|
|
|
NuDataSource** ppDataSource)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2003-02-09 01:53:51 +00:00
|
|
|
return Nu_DataSourceFile_New(threadFormat, otherLen,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
pathnameUNI, (Boolean)(isFromRsrcFork != 0), ppDataSource);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSourceForFP(NuThreadFormat threadFormat,
|
2014-12-22 02:35:09 +00:00
|
|
|
uint32_t otherLen, FILE* fp, long offset, long length,
|
2003-02-09 01:53:51 +00:00
|
|
|
NuCallback fcloseFunc, NuDataSource** ppDataSource)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2003-02-09 01:53:51 +00:00
|
|
|
return Nu_DataSourceFP_New(threadFormat, otherLen,
|
|
|
|
fp, offset, length, fcloseFunc, ppDataSource);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSourceForBuffer(NuThreadFormat threadFormat,
|
2014-12-22 02:35:09 +00:00
|
|
|
uint32_t otherLen, const uint8_t* buffer, long offset,
|
2003-02-09 01:53:51 +00:00
|
|
|
long length, NuCallback freeFunc, NuDataSource** ppDataSource)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2003-02-09 01:53:51 +00:00
|
|
|
return Nu_DataSourceBuffer_New(threadFormat, otherLen,
|
|
|
|
buffer, offset, length, freeFunc, ppDataSource);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuFreeDataSource(NuDataSource* pDataSource)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
return Nu_DataSourceFree(pDataSource);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDataSourceSetRawCrc(NuDataSource* pDataSource,
|
|
|
|
uint16_t crc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pDataSource == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
|
|
|
Nu_DataSourceSetRawCrc(pDataSource, crc);
|
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSinkForFile(short doExpand, NuValue convertEOL,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
const UNICHAR* pathnameUNI, UNICHAR fssep, NuDataSink** ppDataSink)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
return Nu_DataSinkFile_New((Boolean)(doExpand != 0), convertEOL,
|
|
|
|
pathnameUNI, fssep, ppDataSink);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSinkForFP(short doExpand, NuValue convertEOL,
|
|
|
|
FILE* fp, NuDataSink** ppDataSink)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
return Nu_DataSinkFP_New((Boolean)(doExpand != 0), convertEOL, fp,
|
|
|
|
ppDataSink);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuCreateDataSinkForBuffer(short doExpand,
|
|
|
|
NuValue convertEOL, uint8_t* buffer, uint32_t bufLen,
|
|
|
|
NuDataSink** ppDataSink)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
return Nu_DataSinkBuffer_New((Boolean)(doExpand != 0), convertEOL, buffer,
|
|
|
|
bufLen, ppDataSink);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuFreeDataSink(NuDataSink* pDataSink)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
return Nu_DataSinkFree(pDataSink);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuDataSinkGetOutCount(NuDataSink* pDataSink,
|
|
|
|
uint32_t* pOutCount)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pDataSink == NULL || pOutCount == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
*pOutCount = Nu_DataSinkGetOutCount(pDataSink);
|
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Non-archive operations
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API const char* NuStrError(NuError err)
|
2002-10-09 23:12:06 +00:00
|
|
|
{
|
|
|
|
return Nu_StrError(err);
|
|
|
|
}
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API NuError NuGetVersion(int32_t* pMajorVersion, int32_t* pMinorVersion,
|
|
|
|
int32_t* pBugVersion, const char** ppBuildDate, const char** ppBuildFlags)
|
2002-10-09 23:12:06 +00:00
|
|
|
{
|
|
|
|
return Nu_GetVersion(pMajorVersion, pMinorVersion, pBugVersion,
|
|
|
|
ppBuildDate, ppBuildFlags);
|
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuTestFeature(NuFeature feature)
|
2002-10-09 23:12:06 +00:00
|
|
|
{
|
|
|
|
NuError err = kNuErrUnsupFeature;
|
|
|
|
|
|
|
|
switch (feature) {
|
2002-10-10 00:50:37 +00:00
|
|
|
case kNuFeatureCompressSQ:
|
2002-10-09 23:12:06 +00:00
|
|
|
#ifdef ENABLE_SQ
|
|
|
|
err = kNuErrNone;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case kNuFeatureCompressLZW:
|
|
|
|
#ifdef ENABLE_LZW
|
|
|
|
err = kNuErrNone;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case kNuFeatureCompressLZC:
|
|
|
|
#ifdef ENABLE_LZC
|
|
|
|
err = kNuErrNone;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case kNuFeatureCompressDeflate:
|
|
|
|
#ifdef ENABLE_DEFLATE
|
|
|
|
err = kNuErrNone;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case kNuFeatureCompressBzip2:
|
|
|
|
#ifdef ENABLE_BZIP2
|
|
|
|
err = kNuErrNone;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
err = kNuErrUnknownFeature;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API void NuRecordCopyAttr(NuRecordAttr* pRecordAttr,
|
|
|
|
const NuRecord* pRecord)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
pRecordAttr->fileSysID = pRecord->recFileSysID;
|
|
|
|
/*pRecordAttr->fileSysInfo = pRecord->recFileSysInfo;*/
|
|
|
|
pRecordAttr->access = pRecord->recAccess;
|
|
|
|
pRecordAttr->fileType = pRecord->recFileType;
|
|
|
|
pRecordAttr->extraType = pRecord->recExtraType;
|
|
|
|
pRecordAttr->createWhen = pRecord->recCreateWhen;
|
|
|
|
pRecordAttr->modWhen = pRecord->recModWhen;
|
|
|
|
pRecordAttr->archiveWhen = pRecord->recArchiveWhen;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuError NuRecordCopyThreads(const NuRecord* pNuRecord,
|
|
|
|
NuThread** ppThreads)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pNuRecord == NULL || ppThreads == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrInvalidArg;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:17:23 +00:00
|
|
|
Assert(pNuRecord->pThreads != NULL);
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:17:23 +00:00
|
|
|
*ppThreads = Nu_Malloc(NULL, pNuRecord->recTotalThreads * sizeof(NuThread));
|
|
|
|
if (*ppThreads == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrMalloc;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
memcpy(*ppThreads, pNuRecord->pThreads,
|
|
|
|
pNuRecord->recTotalThreads * sizeof(NuThread));
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return kNuErrNone;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API uint32_t NuRecordGetNumThreads(const NuRecord* pNuRecord)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pNuRecord == NULL)
|
2002-09-21 00:49:42 +00:00
|
|
|
return -1;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2002-09-21 00:49:42 +00:00
|
|
|
return pNuRecord->recTotalThreads;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API const NuThread* NuThreadGetByIdx(const NuThread* pNuThread,
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
int32_t idx)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2014-12-22 02:17:23 +00:00
|
|
|
if (pNuThread == NULL)
|
|
|
|
return NULL;
|
2002-09-21 00:49:42 +00:00
|
|
|
return &pNuThread[idx]; /* can't range-check here */
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API short NuIsPresizedThreadID(NuThreadID threadID)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
return Nu_IsPresizedThreadID(threadID);
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
Distinguish Unicode and Mac OS Roman strings
NufxLib has historically made no effort to distinguish between
the character set used for filenames on the local disk, and for
filenames stored within the archive. Now all Unicode filename
strings use the UNICHAR type and have "UNI" in the name, and all
Mac OS Roman strings have "MOR" in the name. (The naming
convention makes it obvious when you're assigning the wrong thing;
on Linux both formats are char*, so the compiler won't tell you
if you get it wrong.)
The distinction is necessary because filesystems generally support
Unicode these days, but on Windows you need to use a separate
set of wide-character file I/O functions. (On Linux it all works
with "narrow" strings, and the UTF-8 encoding is interpreted by
applications.) The character set used for NuFX archive filenames
is MOR, matching what GS/OS + HFS supported, and we want to be able
to convert back and forth between MOR and a Unicode representation.
This change updates the various character types and string names,
adds conversion functions, and updates NuLib2 for proper execution
on Linux. It does not include the (probably extensive) changes
required for Windows UTF-16 support. Instead, the conversion
functions are no-ops, which should result in NuLib2 for Windows
continuing to behave in the same slightly broken way.
This adds "test-names", which exercises Unicode filenames a bit.
It will not pass on Win32.
Also, tweaked the Linux makefiles to have explicit dependencies,
rather than empty space and an expectation that "makedepend" exists.
Also, minor source code cleanups.
While this probably doesn't affect binary compatibility -- it's
mainly a matter of naming and string interpretation -- there's
enough going on that it should be considered an API revision, so
this updates the version to 3.0.0.
2014-12-24 19:14:32 +00:00
|
|
|
NUFXLIB_API size_t NuConvertMORToUNI(const char* stringMOR,
|
|
|
|
UNICHAR* bufUNI, size_t bufSize)
|
|
|
|
{
|
|
|
|
return Nu_ConvertMORToUNI(stringMOR, bufUNI, bufSize);
|
|
|
|
}
|
|
|
|
|
|
|
|
NUFXLIB_API size_t NuConvertUNIToMOR(const UNICHAR* stringUNI,
|
|
|
|
char* bufMOR, size_t bufSize)
|
|
|
|
{
|
|
|
|
return Nu_ConvertUNIToMOR(stringUNI, bufMOR, bufSize);
|
|
|
|
}
|
|
|
|
|
2000-05-23 01:55:31 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2002-09-21 00:49:42 +00:00
|
|
|
* Callback setters
|
2000-05-23 01:55:31 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetSelectionFilter(NuArchive* pArchive,
|
|
|
|
NuCallback filterFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)filterFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
oldFunc = pArchive->selectionFilterFunc;
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->selectionFilterFunc = filterFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetOutputPathnameFilter(NuArchive* pArchive,
|
|
|
|
NuCallback filterFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)filterFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
oldFunc = pArchive->outputPathnameFunc;
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->outputPathnameFunc = filterFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetProgressUpdater(NuArchive* pArchive,
|
|
|
|
NuCallback updateFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)updateFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
oldFunc = pArchive->progressUpdaterFunc;
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->progressUpdaterFunc = updateFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetErrorHandler(NuArchive* pArchive,
|
|
|
|
NuCallback errorFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)errorFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
oldFunc = pArchive->errorHandlerFunc;
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->errorHandlerFunc = errorFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetErrorMessageHandler(NuArchive* pArchive,
|
|
|
|
NuCallback messageHandlerFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2002-09-21 00:49:42 +00:00
|
|
|
NuError err;
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)messageHandlerFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
if ((err = Nu_ValidateNuArchive(pArchive)) == kNuErrNone) {
|
|
|
|
oldFunc = pArchive->messageHandlerFunc;
|
2002-09-21 00:49:42 +00:00
|
|
|
pArchive->messageHandlerFunc = messageHandlerFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
}
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|
2014-12-23 00:00:33 +00:00
|
|
|
NUFXLIB_API NuCallback NuSetGlobalErrorMessageHandler(NuCallback messageHandlerFunc)
|
2000-05-23 01:55:31 +00:00
|
|
|
{
|
2003-02-18 21:41:10 +00:00
|
|
|
NuCallback oldFunc = kNuInvalidCallback;
|
2014-12-22 02:35:09 +00:00
|
|
|
/*Assert(!((uint32_t)messageHandlerFunc % 4));*/
|
2000-05-23 01:55:31 +00:00
|
|
|
|
2003-02-18 21:41:10 +00:00
|
|
|
oldFunc = gNuGlobalErrorMessageHandler;
|
2002-09-21 00:49:42 +00:00
|
|
|
gNuGlobalErrorMessageHandler = messageHandlerFunc;
|
2003-02-18 21:41:10 +00:00
|
|
|
return oldFunc;
|
2000-05-23 01:55:31 +00:00
|
|
|
}
|
|
|
|
|