mirror of
https://github.com/fadden/nulib2.git
synced 2024-06-01 17:41:40 +00:00
e2088e64d3
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.
139 lines
3.0 KiB
C
139 lines
3.0 KiB
C
/*
|
|
* NuLib2
|
|
* Copyright (C) 2000-2007 by Andy McFadden, All Rights Reserved.
|
|
* This is free software; you can redistribute it and/or modify it under the
|
|
* terms of the BSD License, see the file COPYING.
|
|
*
|
|
* Misc support functions.
|
|
*/
|
|
#include "NuLib2.h"
|
|
|
|
|
|
/*
|
|
* Similar to perror(), but takes the error as an argument, and knows
|
|
* about NufxLib errors as well as system errors.
|
|
*
|
|
* If "format" is NULL, just the error message itself is printed.
|
|
*/
|
|
void ReportError(NuError err, const char* format, ...)
|
|
{
|
|
const char* msg;
|
|
va_list args;
|
|
|
|
Assert(format != NULL);
|
|
|
|
va_start(args, format);
|
|
|
|
/* print the message, if any */
|
|
if (format != NULL) {
|
|
fprintf(stderr, "%s: ERROR: ", gProgName);
|
|
vfprintf(stderr, format, args);
|
|
}
|
|
|
|
/* print the error code data, if any */
|
|
if (err == kNuErrNone)
|
|
fprintf(stderr, "\n");
|
|
else {
|
|
if (format != NULL)
|
|
fprintf(stderr, ": ");
|
|
|
|
msg = NULL;
|
|
if (err >= 0)
|
|
msg = strerror(err);
|
|
if (msg == NULL)
|
|
msg = NuStrError(err);
|
|
|
|
if (msg == NULL)
|
|
fprintf(stderr, "(unknown err=%d)\n", err);
|
|
else
|
|
fprintf(stderr, "%s\n", msg);
|
|
}
|
|
|
|
va_end(args);
|
|
}
|
|
|
|
|
|
/*
|
|
* Memory allocation wrappers.
|
|
*
|
|
* Under gcc these would be macros, but not all compilers can handle that.
|
|
*/
|
|
|
|
#ifndef USE_DMALLOC
|
|
void* Malloc(size_t size)
|
|
{
|
|
void* _result;
|
|
|
|
Assert(size > 0);
|
|
_result = malloc(size);
|
|
if (_result == NULL) {
|
|
ReportError(kNuErrMalloc, "malloc(%u) failed", (unsigned int) size);
|
|
DebugAbort(); /* leave a core dump if we're built for it */
|
|
}
|
|
DebugFill(_result, size);
|
|
return _result;
|
|
}
|
|
|
|
void* Calloc(size_t size)
|
|
{
|
|
void* _cresult = Malloc(size);
|
|
memset(_cresult, 0, size);
|
|
return _cresult;
|
|
}
|
|
|
|
void* Realloc(void* ptr, size_t size)
|
|
{
|
|
void* _result;
|
|
|
|
Assert(ptr != NULL); /* disallow this usage */
|
|
Assert(size > 0); /* disallow this usage */
|
|
_result = realloc(ptr, size);
|
|
if (_result == NULL) {
|
|
ReportError(kNuErrMalloc, "realloc(%u) failed", (unsigned int) size);
|
|
DebugAbort(); /* leave a core dump if we're built for it */
|
|
}
|
|
return _result;
|
|
}
|
|
|
|
void Free(void* ptr)
|
|
{
|
|
if (ptr != NULL)
|
|
free(ptr);
|
|
}
|
|
#endif
|
|
|
|
/*
|
|
* This gets called when a buffer DataSource is no longer needed.
|
|
*/
|
|
NuResult FreeCallback(NuArchive* pArchive, void* args)
|
|
{
|
|
DBUG(("+++ free callback 0x%08lx\n", (long) args));
|
|
Free(args);
|
|
return kNuOK;
|
|
}
|
|
|
|
/*
|
|
* Convert Mac OS Roman to Unicode. The caller must free the string
|
|
* returned.
|
|
*
|
|
* Returns NULL if stringMOR is NULL or if the conversion fails.
|
|
*/
|
|
UNICHAR* CopyMORToUNI(const char* stringMOR)
|
|
{
|
|
size_t uniLen;
|
|
UNICHAR* uniBuf;
|
|
|
|
if (stringMOR == NULL) {
|
|
return NULL;
|
|
}
|
|
|
|
uniLen = NuConvertMORToUNI(stringMOR, NULL, 0);
|
|
if (uniLen == (size_t) -1) {
|
|
return NULL;
|
|
}
|
|
uniBuf = (UNICHAR*) malloc(uniLen);
|
|
NuConvertMORToUNI(stringMOR, uniBuf, uniLen);
|
|
return uniBuf;
|
|
}
|
|
|