mirror of
https://github.com/fadden/nulib2.git
synced 2024-06-10 16:29:29 +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.
67 lines
1.3 KiB
C
67 lines
1.3 KiB
C
/*
|
|
* NuFX archive manipulation library
|
|
* 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.LIB.
|
|
*
|
|
* Common functions for NuLib tests.
|
|
*/
|
|
#ifndef NUFXLIB_SAMPLES_COMMON_H
|
|
#define NUFXLIB_SAMPLES_COMMON_H
|
|
|
|
#include "SysDefs.h" /* might as well draft off the autoconf */
|
|
#include "NufxLib.h"
|
|
|
|
#ifdef USE_DMALLOC
|
|
# include "dmalloc.h"
|
|
#endif
|
|
|
|
#define NELEM(x) (sizeof(x) / sizeof((x)[0]))
|
|
|
|
#ifndef __cplusplus
|
|
#define false 0
|
|
#define true (!false)
|
|
#endif
|
|
|
|
|
|
#ifdef FOPEN_WANTS_B
|
|
# define kNuFileOpenReadOnly "rb"
|
|
# define kNuFileOpenReadWrite "r+b"
|
|
# define kNuFileOpenWriteTrunc "wb"
|
|
# define kNuFileOpenReadWriteCreat "w+b"
|
|
#else
|
|
# define kNuFileOpenReadOnly "r"
|
|
# define kNuFileOpenReadWrite "r+"
|
|
# define kNuFileOpenWriteTrunc "w"
|
|
# define kNuFileOpenReadWriteCreat "w+"
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Figure out what path separator to use.
|
|
*
|
|
* NOTE: recent versions of Win32 will also accept '/'.
|
|
*/
|
|
|
|
#ifdef MSDOS
|
|
# define PATH_SEP '\\'
|
|
#endif
|
|
|
|
#ifdef WIN32
|
|
# define PATH_SEP '\\'
|
|
#endif
|
|
|
|
#ifdef MACOS
|
|
# define PATH_SEP ':'
|
|
#endif
|
|
|
|
#if defined(APW) || defined(__ORCAC__)
|
|
# define PATH_SEP ':'
|
|
#endif
|
|
|
|
#ifndef PATH_SEP
|
|
# define PATH_SEP '/'
|
|
#endif
|
|
|
|
#endif /*NUFXLIB_SAMPLES_COMMON_H*/
|