2007-03-27 17:47:10 +00:00
|
|
|
/*
|
|
|
|
* CiderPress
|
|
|
|
* Copyright (C) 2007 by faddenSoft, LLC. All Rights Reserved.
|
|
|
|
* See the file LICENSE for distribution terms.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
* Implementation of GenericArchive and GenericEntry.
|
|
|
|
*
|
|
|
|
* These serve as abstract base classes for archive-specific classes.
|
|
|
|
*/
|
|
|
|
#include "stdafx.h"
|
|
|
|
#include "GenericArchive.h"
|
2015-01-05 05:04:01 +00:00
|
|
|
#include "NufxArchive.h"
|
2007-03-27 17:47:10 +00:00
|
|
|
#include "FileNameConv.h"
|
|
|
|
#include "ContentList.h"
|
2015-01-09 01:41:53 +00:00
|
|
|
#include "../reformat/ReformatBase.h"
|
2007-03-27 17:47:10 +00:00
|
|
|
#include "Main.h"
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include <errno.h>
|
|
|
|
|
|
|
|
/*
|
|
|
|
* For systems (e.g. Visual C++ 6.0) that don't have these standard values.
|
|
|
|
*/
|
|
|
|
#ifndef S_IRUSR
|
|
|
|
# define S_IRUSR 0400
|
|
|
|
# define S_IWUSR 0200
|
|
|
|
# define S_IXUSR 0100
|
|
|
|
# define S_IRWXU (S_IRUSR|S_IWUSR|S_IXUSR)
|
|
|
|
# define S_IRGRP (S_IRUSR >> 3)
|
|
|
|
# define S_IWGRP (S_IWUSR >> 3)
|
|
|
|
# define S_IXGRP (S_IXUSR >> 3)
|
|
|
|
# define S_IRWXG (S_IRWXU >> 3)
|
|
|
|
# define S_IROTH (S_IRGRP >> 3)
|
|
|
|
# define S_IWOTH (S_IWGRP >> 3)
|
|
|
|
# define S_IXOTH (S_IXGRP >> 3)
|
|
|
|
# define S_IRWXO (S_IRWXG >> 3)
|
|
|
|
#endif
|
|
|
|
#ifndef S_ISREG
|
|
|
|
# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
|
|
|
|
# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2014-11-04 00:26:53 +00:00
|
|
|
* GenericEntry
|
2007-03-27 17:47:10 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
GenericEntry::GenericEntry(void)
|
2015-01-09 01:41:53 +00:00
|
|
|
: fFssep('\0'),
|
2015-01-05 05:04:01 +00:00
|
|
|
fFileType(0),
|
|
|
|
fAuxType(0),
|
|
|
|
fAccess(0),
|
|
|
|
fCreateWhen(kDateNone),
|
|
|
|
fModWhen(kDateNone),
|
|
|
|
fRecordKind(kRecordKindUnknown),
|
|
|
|
fFormatStr(L"Unknown"),
|
|
|
|
fDataForkLen(0),
|
|
|
|
fRsrcForkLen(0),
|
|
|
|
fCompressedLen(0),
|
|
|
|
fSourceFS(DiskImg::kFormatUnknown),
|
|
|
|
fHasDataFork(false),
|
|
|
|
fHasRsrcFork(false),
|
|
|
|
fHasDiskImage(false),
|
|
|
|
fHasComment(false),
|
|
|
|
fHasNonEmptyComment(false),
|
|
|
|
fDamaged(false),
|
|
|
|
fSuspicious(false),
|
|
|
|
fIndex(-1),
|
|
|
|
fpPrev(NULL),
|
|
|
|
fpNext(NULL)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
GenericEntry::~GenericEntry(void) {}
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
void GenericEntry::SetPathNameMOR(const char* path)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
ASSERT(path != NULL && strlen(path) > 0);
|
|
|
|
fPathNameMOR = path;
|
2014-11-04 00:26:53 +00:00
|
|
|
// nuke the derived fields
|
2015-01-09 01:41:53 +00:00
|
|
|
fFileName = L"";
|
|
|
|
fFileNameExtension = L"";
|
|
|
|
fDisplayName = L"";
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Generate the Unicode representation from the Mac OS Roman source.
|
|
|
|
* For now, we just treat the input as CP-1252.
|
|
|
|
*
|
|
|
|
* TODO(Unicode)
|
|
|
|
*/
|
|
|
|
fPathNameUNI = fPathNameMOR;
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Warning: to be 100% pedantically correct here, we should NOT do this
|
|
|
|
* if the fssep char is '_'. However, that may not have been set by
|
|
|
|
* the time we got here, so to do this "correctly" we'd need to delay
|
|
|
|
* the underscorage until the first GetPathName call.
|
|
|
|
*/
|
|
|
|
const Preferences* pPreferences = GET_PREFERENCES();
|
2015-01-09 01:41:53 +00:00
|
|
|
if (pPreferences->GetPrefBool(kPrSpacesToUnder)) {
|
|
|
|
SpacesToUnderscores(&fPathNameMOR);
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
2014-11-21 21:18:20 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
const CString& GenericEntry::GetFileName(void)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
ASSERT(!fPathNameMOR.IsEmpty());
|
|
|
|
if (fFileName.IsEmpty()) {
|
|
|
|
fFileName = PathName::FilenameOnly(fPathNameUNI, fFssep);
|
|
|
|
}
|
2014-11-04 00:26:53 +00:00
|
|
|
return fFileName;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
2014-11-21 21:18:20 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
const CString& GenericEntry::GetFileNameExtension(void)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
ASSERT(!fPathNameMOR.IsEmpty());
|
|
|
|
if (fFileNameExtension.IsEmpty()) {
|
|
|
|
fFileNameExtension = PathName::FindExtension(fPathNameUNI, fFssep);
|
|
|
|
}
|
2014-11-04 00:26:53 +00:00
|
|
|
return fFileNameExtension;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
2014-11-21 21:18:20 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
const CStringA& GenericEntry::GetFileNameExtensionMOR(void)
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
ASSERT(!fPathNameMOR.IsEmpty());
|
|
|
|
if (fFileNameExtensionMOR.IsEmpty()) {
|
|
|
|
CString str = PathName::FindExtension(fPathNameUNI, fFssep);
|
|
|
|
// TODO(Unicode): either get the extension from the MOR filename,
|
|
|
|
// or convert this properly from Unicode to MOR (not CP-1252).
|
|
|
|
fFileNameExtensionMOR = str;
|
|
|
|
}
|
|
|
|
return fFileNameExtensionMOR;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
}
|
2014-11-21 21:18:20 +00:00
|
|
|
|
|
|
|
void GenericEntry::SetSubVolName(const WCHAR* name)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
fSubVolName = name;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Simple Mac OS Roman to Unicode conversion.
|
|
|
|
static CString ConvertMORToUNI(const CStringA& strMOR)
|
|
|
|
{
|
|
|
|
// We know that all MOR characters are represented in Unicode with a
|
|
|
|
// single BMP code point, so we know that strlen(MOR) == wcslen(UNI).
|
|
|
|
const int len = strMOR.GetLength();
|
|
|
|
CString strUNI;
|
|
|
|
WCHAR* uniBuf = strUNI.GetBuffer(len);
|
|
|
|
for (int i = 0; i < len; i++) {
|
|
|
|
uniBuf[i] = ReformatText::ConvertMacRomanToUTF16(strMOR[i]);
|
2014-11-04 00:26:53 +00:00
|
|
|
}
|
2015-01-09 01:41:53 +00:00
|
|
|
strUNI.ReleaseBuffer(len);
|
|
|
|
return strUNI;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
2014-11-21 21:18:20 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
const CString& GenericEntry::GetDisplayName(void) const
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
ASSERT(!fPathNameMOR.IsEmpty());
|
|
|
|
if (!fDisplayName.IsEmpty()) {
|
2014-11-04 00:26:53 +00:00
|
|
|
return fDisplayName;
|
2015-01-09 01:41:53 +00:00
|
|
|
}
|
2014-11-04 00:26:53 +00:00
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
if (!fSubVolName.IsEmpty()) {
|
|
|
|
fDisplayName = fSubVolName + (WCHAR) DiskFS::kDIFssep;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
}
|
2015-01-09 01:41:53 +00:00
|
|
|
fDisplayName += ConvertMORToUNI(fPathNameMOR);
|
|
|
|
return fDisplayName;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
const WCHAR* GenericEntry::GetFileTypeString(void) const
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
return PathProposal::FileTypeString(fFileType);
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
/*static*/ void GenericEntry::SpacesToUnderscores(CStringA* pStr)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-09 01:41:53 +00:00
|
|
|
pStr->Replace(' ', '_');
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
/*static*/ bool GenericEntry::CheckHighASCII(const uint8_t* buffer,
|
2015-01-05 05:04:01 +00:00
|
|
|
size_t count)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-21 21:18:20 +00:00
|
|
|
/*
|
|
|
|
* (Pulled from NufxLib Funnel.c.)
|
|
|
|
*
|
|
|
|
* Check to see if this is a high-ASCII file. To qualify, EVERY
|
|
|
|
* character must have its high bit set, except for spaces (0x20,
|
|
|
|
* courtesy Glen Bredon's "Merlin") and nulls (0x00, because of random-
|
|
|
|
* access text files).
|
|
|
|
*
|
|
|
|
* The test for 0x00 is actually useless in many circumstances because the
|
|
|
|
* NULLs will cause the text file auto-detector to flunk the file. It will,
|
|
|
|
* however, allow the user to select "convert ALL files" and still have the
|
|
|
|
* stripping enabled.
|
|
|
|
*/
|
2014-11-04 00:26:53 +00:00
|
|
|
bool isHighASCII;
|
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(buffer != NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(count != 0);
|
|
|
|
|
|
|
|
isHighASCII = true;
|
|
|
|
while (count--) {
|
|
|
|
if ((*buffer & 0x80) == 0 && *buffer != 0x20 && *buffer != 0x00) {
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("Flunking CheckHighASCII on 0x%02x", *buffer);
|
2014-11-04 00:26:53 +00:00
|
|
|
isHighASCII = false;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return isHighASCII;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* (Pulled from NufxLib Funnel.c.)
|
|
|
|
*
|
|
|
|
* Table determining what's a binary character and what isn't. It would
|
|
|
|
* possibly be more compact to generate this from a simple description,
|
|
|
|
* but I'm hoping static/const data will end up in the code segment and
|
|
|
|
* save space on the heap.
|
|
|
|
*
|
|
|
|
* This corresponds to less-316's ISO-latin1 "8bcccbcc18b95.33b.". This
|
|
|
|
* may be too loose by itself; we may want to require that the lower-ASCII
|
|
|
|
* values appear in higher proportions than the upper-ASCII values.
|
|
|
|
* Otherwise we run the risk of converting a binary file with specific
|
|
|
|
* properties. (Note that "upper-ASCII" refers to umlauts and other
|
|
|
|
* accented characters, not DOS 3.3 "high ASCII".)
|
|
|
|
*
|
|
|
|
* The auto-detect mechanism will never be perfect though, so there's not
|
|
|
|
* much point in tweaking it to death.
|
|
|
|
*/
|
|
|
|
static const char gIsBinary[256] = {
|
2014-11-04 00:26:53 +00:00
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, /* ^@-^O */
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* ^P-^_ */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* - / */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0 - ? */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* @ - O */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* P - _ */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* ` - o */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, /* p - DEL */
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x80 */
|
|
|
|
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, /* 0x90 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xa0 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xb0 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xc0 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xd0 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xe0 */
|
|
|
|
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, /* 0xf0 */
|
2007-03-27 17:47:10 +00:00
|
|
|
};
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
static const int kNuMaxUpperASCII = 1; /* max #of binary chars per 100 bytes */
|
|
|
|
static const int kMinConvThreshold = 40; /* min of 40 chars for auto-detect */
|
|
|
|
static const char kCharLF = '\n';
|
|
|
|
static const char kCharCR = '\r';
|
|
|
|
|
|
|
|
/*static*/ GenericEntry::ConvertEOL GenericEntry::DetermineConversion(
|
2015-01-05 05:04:01 +00:00
|
|
|
const uint8_t* buffer, size_t count,
|
2014-11-04 00:26:53 +00:00
|
|
|
EOLType* pSourceType, ConvertHighASCII* pConvHA)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-21 21:18:20 +00:00
|
|
|
/*
|
|
|
|
* We need to decide if we are looking at text data, and if so, what kind
|
|
|
|
* of line terminator is in use.
|
|
|
|
*
|
|
|
|
* If we don't have enough data to make a determination, don't mess with it.
|
|
|
|
* (Thought for the day: add a "bias" flag, based on the NuRecord fileType,
|
|
|
|
* that causes us to handle borderline or sub-min-threshold cases more
|
|
|
|
* reasonably. If it's of type TXT, it's probably text.)
|
|
|
|
*
|
|
|
|
* We try to figure out whether it's CR, LF, or CRLF, so that we can
|
|
|
|
* skip the CPU-intensive conversion process if it isn't necessary.
|
|
|
|
*
|
|
|
|
* We will also investigate enabling a "high-ASCII" stripper if requested.
|
|
|
|
* This is only enabled when EOL conversions are enabled. Set "*pConvHA"
|
|
|
|
* to on/off/auto before calling. If it's initially set to "off", no
|
|
|
|
* attempt to evaluate high ASCII will be made. If "on" or "auto", the
|
|
|
|
* buffer will be scanned, and if the input appears to be high ASCII then
|
|
|
|
* it will be stripped *before* the EOL determination is made.
|
|
|
|
*/
|
2014-11-04 00:26:53 +00:00
|
|
|
ConvertHighASCII wantConvHA = *pConvHA;
|
2015-01-05 05:04:01 +00:00
|
|
|
size_t bufCount, numBinary, numLF, numCR;
|
2014-11-04 00:26:53 +00:00
|
|
|
bool isHighASCII;
|
2014-11-21 21:18:20 +00:00
|
|
|
uint8_t val;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
*pSourceType = kEOLUnknown;
|
|
|
|
*pConvHA = kConvertHAOff;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
if (count < kMinConvThreshold)
|
|
|
|
return kConvertEOLOff;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Check to see if the buffer is all high-ASCII characters. If it is,
|
|
|
|
* we want to strip characters before we test them below.
|
2014-11-04 00:26:53 +00:00
|
|
|
*
|
|
|
|
* If high ASCII conversion is disabled, assume that any high-ASCII
|
|
|
|
* characters are not meant to be line terminators, i.e. 0x8d != 0x0d.
|
2007-03-27 17:47:10 +00:00
|
|
|
*/
|
2014-11-04 00:26:53 +00:00
|
|
|
if (wantConvHA == kConvertHAOn || wantConvHA == kConvertHAAuto) {
|
2007-03-27 17:47:10 +00:00
|
|
|
isHighASCII = CheckHighASCII(buffer, count);
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI(" +++ Determined isHighASCII=%d", isHighASCII);
|
2014-11-04 00:26:53 +00:00
|
|
|
} else {
|
|
|
|
isHighASCII = false;
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI(" +++ Not even checking isHighASCII");
|
2014-11-04 00:26:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bufCount = count;
|
|
|
|
numBinary = numLF = numCR = 0;
|
|
|
|
while (bufCount--) {
|
|
|
|
val = *buffer++;
|
|
|
|
if (isHighASCII)
|
|
|
|
val &= 0x7f;
|
|
|
|
if (gIsBinary[val])
|
|
|
|
numBinary++;
|
|
|
|
if (val == kCharLF)
|
|
|
|
numLF++;
|
|
|
|
if (val == kCharCR)
|
|
|
|
numCR++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if #found is > #allowed, it's a binary file */
|
|
|
|
if (count < 100) {
|
|
|
|
/* use simplified check on files between kNuMinConvThreshold and 100 */
|
|
|
|
if (numBinary > kNuMaxUpperASCII)
|
|
|
|
return kConvertEOLOff;
|
|
|
|
} else if (numBinary > (count / 100) * kNuMaxUpperASCII)
|
|
|
|
return kConvertEOLOff;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If our "convert to" setting is the same as what we're converting
|
|
|
|
* from, we can turn off the converter and speed things up.
|
|
|
|
*
|
|
|
|
* These are simplistic, but this is intended as an optimization. We
|
|
|
|
* will blow it if the input has lots of CRs and LFs scattered about,
|
|
|
|
* and they just happen to be in equal amounts, but it's not clear
|
|
|
|
* to me that an automatic EOL conversion makes sense on that sort
|
|
|
|
* of file anyway.
|
|
|
|
*
|
|
|
|
* None of this applies if we also need to do a high-ASCII conversion,
|
|
|
|
* because we can't bypass the processing.
|
|
|
|
*/
|
|
|
|
if (isHighASCII) {
|
|
|
|
*pConvHA = kConvertHAOn;
|
|
|
|
} else {
|
|
|
|
if (numLF && !numCR)
|
|
|
|
*pSourceType = kEOLLF;
|
|
|
|
else if (!numLF && numCR)
|
|
|
|
*pSourceType = kEOLCR;
|
|
|
|
else if (numLF && numLF == numCR)
|
|
|
|
*pSourceType = kEOLCRLF;
|
|
|
|
else
|
|
|
|
*pSourceType = kEOLUnknown;
|
|
|
|
}
|
|
|
|
|
|
|
|
return kConvertEOLOn;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Output CRLF.
|
|
|
|
*/
|
2014-11-21 21:18:20 +00:00
|
|
|
static inline void PutEOL(FILE* fp)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
putc(kCharCR, fp);
|
|
|
|
putc(kCharLF, fp);
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
/*static*/ int GenericEntry::WriteConvert(FILE* fp, const char* buf, size_t len,
|
2014-11-04 00:26:53 +00:00
|
|
|
ConvertEOL* pConv, ConvertHighASCII* pConvHA, bool* pLastCR)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
int err = 0;
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("+++ WriteConvert conv=%d convHA=%d", *pConv, *pConvHA);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
if (len == 0) {
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("WriteConvert asked to write 0 bytes; returning");
|
2014-11-04 00:26:53 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if we're in "auto" mode, scan the input for EOL and high ASCII */
|
|
|
|
if (*pConv == kConvertEOLAuto) {
|
|
|
|
EOLType sourceType;
|
2014-11-21 21:18:20 +00:00
|
|
|
*pConv = DetermineConversion((uint8_t*)buf, len, &sourceType,
|
2014-11-04 00:26:53 +00:00
|
|
|
pConvHA);
|
|
|
|
if (*pConv == kConvertEOLOn && sourceType == kEOLCRLF) {
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI(" Auto-detected text conversion from CRLF; disabling");
|
2014-11-04 00:26:53 +00:00
|
|
|
*pConv = kConvertEOLOff;
|
|
|
|
}
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI(" Auto-detected EOL conv=%d ha=%d", *pConv, *pConvHA);
|
2014-11-04 00:26:53 +00:00
|
|
|
} else if (*pConvHA == kConvertHAAuto) {
|
|
|
|
if (*pConv == kConvertEOLOn) {
|
|
|
|
/* definitely converting EOL, test for high ASCII */
|
2014-11-21 21:18:20 +00:00
|
|
|
if (CheckHighASCII((uint8_t*)buf, len))
|
2014-11-04 00:26:53 +00:00
|
|
|
*pConvHA = kConvertHAOn;
|
|
|
|
else
|
|
|
|
*pConvHA = kConvertHAOff;
|
|
|
|
} else {
|
|
|
|
/* not converting EOL, don't convert high ASCII */
|
|
|
|
*pConvHA = kConvertHAOff;
|
|
|
|
}
|
|
|
|
}
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("+++ After auto, conv=%d convHA=%d", *pConv, *pConvHA);
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(*pConv == kConvertEOLOn || *pConv == kConvertEOLOff);
|
|
|
|
ASSERT(*pConvHA == kConvertHAOn || *pConvHA == kConvertHAOff);
|
|
|
|
|
|
|
|
/* write the output */
|
|
|
|
if (*pConv == kConvertEOLOff) {
|
|
|
|
if (fwrite(buf, len, 1, fp) != 1) {
|
|
|
|
err = errno;
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGE("WriteConvert failed, err=%d", errno);
|
2014-11-04 00:26:53 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
ASSERT(*pConv == kConvertEOLOn);
|
|
|
|
bool lastCR = *pLastCR;
|
2014-11-21 21:18:20 +00:00
|
|
|
uint8_t uch;
|
2014-11-04 00:26:53 +00:00
|
|
|
int mask;
|
|
|
|
|
|
|
|
if (*pConvHA == kConvertHAOn)
|
|
|
|
mask = 0x7f;
|
|
|
|
else
|
|
|
|
mask = 0xff;
|
|
|
|
|
|
|
|
while (len--) {
|
|
|
|
uch = (*buf) & mask;
|
|
|
|
|
|
|
|
if (uch == kCharCR) {
|
|
|
|
PutEOL(fp);
|
|
|
|
lastCR = true;
|
|
|
|
} else if (uch == kCharLF) {
|
|
|
|
if (!lastCR)
|
|
|
|
PutEOL(fp);
|
|
|
|
lastCR = false;
|
|
|
|
} else {
|
|
|
|
putc(uch, fp);
|
|
|
|
lastCR = false;
|
|
|
|
}
|
|
|
|
buf++;
|
|
|
|
}
|
|
|
|
*pLastCR = lastCR;
|
|
|
|
}
|
|
|
|
|
|
|
|
return err;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2014-11-04 00:26:53 +00:00
|
|
|
* GenericArchive
|
2007-03-27 17:47:10 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void GenericArchive::AddEntry(GenericEntry* pEntry)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-18 05:13:13 +00:00
|
|
|
if (fEntryHead == NULL) {
|
|
|
|
ASSERT(fEntryTail == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryHead = pEntry;
|
|
|
|
fEntryTail = pEntry;
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(pEntry->GetPrev() == NULL);
|
|
|
|
ASSERT(pEntry->GetNext() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
} else {
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(fEntryTail != NULL);
|
|
|
|
ASSERT(pEntry->GetPrev() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry->SetPrev(fEntryTail);
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(fEntryTail->GetNext() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryTail->SetNext(pEntry);
|
|
|
|
fEntryTail = pEntry;
|
|
|
|
}
|
|
|
|
|
|
|
|
fNumEntries++;
|
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
//if (fEntryIndex != NULL) {
|
2014-11-18 21:05:15 +00:00
|
|
|
// LOGI("Resetting fEntryIndex");
|
2014-11-04 00:26:53 +00:00
|
|
|
// delete [] fEntryIndex;
|
2014-11-18 05:13:13 +00:00
|
|
|
// fEntryIndex = NULL;
|
2014-11-04 00:26:53 +00:00
|
|
|
//}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void GenericArchive::DeleteEntries(void)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
GenericEntry* pEntry;
|
|
|
|
GenericEntry* pNext;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("Deleting %d archive entries", fNumEntries);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = GetEntries();
|
2014-11-18 05:13:13 +00:00
|
|
|
while (pEntry != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
pNext = pEntry->GetNext();
|
|
|
|
delete pEntry;
|
|
|
|
pEntry = pNext;
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
//delete [] fEntryIndex;
|
|
|
|
fNumEntries = 0;
|
2014-11-18 05:13:13 +00:00
|
|
|
fEntryHead = fEntryTail = NULL;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/*
|
|
|
|
* Create an index for fast access.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
GenericArchive::CreateIndex(void)
|
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
GenericEntry* pEntry;
|
|
|
|
int num;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("Creating entry index (%d entries)", fNumEntries);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(fNumEntries != 0);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryIndex = new GenericEntry*[fNumEntries];
|
2014-11-18 05:13:13 +00:00
|
|
|
if (fEntryIndex == NULL)
|
2014-11-04 00:26:53 +00:00
|
|
|
return;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = GetEntries();
|
|
|
|
num = 0;
|
2014-11-18 05:13:13 +00:00
|
|
|
while (pEntry != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryIndex[num] = pEntry;
|
|
|
|
pEntry = pEntry->GetNext();
|
|
|
|
num++;
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
/*static*/ CString GenericArchive::GenDerivedTempName(const WCHAR* filename)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-21 21:18:20 +00:00
|
|
|
/*
|
|
|
|
* The key is to come up with the name of a temp file in the same directory
|
|
|
|
* (or at least on the same disk volume) so that the temp file can be
|
|
|
|
* renamed on top of the original.
|
|
|
|
*
|
|
|
|
* Windows _mktemp does appear to test for the existence of the file, which
|
|
|
|
* is good. It doesn't actually open the file, which creates a small window
|
|
|
|
* in which bad things could happen, but it should be okay.
|
|
|
|
*/
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
static const WCHAR kTmpTemplate[] = L"CPtmp_XXXXXX";
|
2014-11-04 00:26:53 +00:00
|
|
|
CString mangle(filename);
|
|
|
|
int idx, len;
|
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(filename != NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
len = mangle.GetLength();
|
|
|
|
ASSERT(len > 0);
|
|
|
|
idx = mangle.ReverseFind('\\');
|
|
|
|
if (idx < 0) {
|
|
|
|
/* generally shouldn't happen -- we're using full paths */
|
|
|
|
return kTmpTemplate;
|
|
|
|
} else {
|
|
|
|
mangle.Delete(idx+1, len-(idx+1)); /* delete out to the end */
|
|
|
|
mangle += kTmpTemplate;
|
|
|
|
}
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("GenDerived: passed '%ls' returned '%ls'", filename, (LPCWSTR) mangle);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
return mangle;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
/*static*/ int GenericArchive::ComparePaths(const CString& name1, char fssep1,
|
2014-11-04 00:26:53 +00:00
|
|
|
const CString& name2, char fssep2)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
const WCHAR* cp1 = name1;
|
|
|
|
const WCHAR* cp2 = name2;
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
while (*cp1 != '\0' && *cp2 != '\0') {
|
|
|
|
if (*cp1 == fssep1) {
|
|
|
|
if (*cp2 != fssep2) {
|
|
|
|
/* one fssep, one not, no match */
|
|
|
|
if (*cp1 == *cp2)
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return *cp1 - *cp2;
|
|
|
|
} else {
|
|
|
|
/* both are fssep, it's a match even if ASCII is different */
|
|
|
|
}
|
|
|
|
} else if (*cp2 == fssep2) {
|
|
|
|
/* one fssep, one not */
|
|
|
|
if (*cp1 == *cp2)
|
|
|
|
return -1;
|
|
|
|
else
|
|
|
|
return *cp1 - *cp2;
|
|
|
|
} else if (tolower(*cp1) != tolower(*cp2)) {
|
|
|
|
/* mismatch */
|
|
|
|
return tolower(*cp1) - tolower(*cp2);
|
|
|
|
}
|
|
|
|
|
|
|
|
cp1++;
|
|
|
|
cp2++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return *cp1 - *cp2;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2014-11-04 00:26:53 +00:00
|
|
|
* GenericArchive -- "add files" stuff
|
2007-03-27 17:47:10 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2015-01-05 05:04:01 +00:00
|
|
|
* Much of this was adapted from NuLib2.
|
2007-03-27 17:47:10 +00:00
|
|
|
*/
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
/*static*/ void GenericArchive::UNIXTimeToDateTime(const time_t* pWhen,
|
|
|
|
NuDateTime* pDateTime)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
|
|
|
struct tm* ptm;
|
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(pWhen != NULL);
|
|
|
|
ASSERT(pDateTime != NULL);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
ptm = localtime(pWhen);
|
2014-11-18 05:13:13 +00:00
|
|
|
if (ptm == NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(*pWhen == kDateNone || *pWhen == kDateInvalid);
|
|
|
|
memset(pDateTime, 0, sizeof(*pDateTime));
|
|
|
|
return;
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
pDateTime->second = ptm->tm_sec;
|
|
|
|
pDateTime->minute = ptm->tm_min;
|
|
|
|
pDateTime->hour = ptm->tm_hour;
|
|
|
|
pDateTime->day = ptm->tm_mday -1;
|
|
|
|
pDateTime->month = ptm->tm_mon;
|
|
|
|
pDateTime->year = ptm->tm_year;
|
|
|
|
pDateTime->extra = 0;
|
|
|
|
pDateTime->weekDay = ptm->tm_wday +1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Directory structure and functions, based on zDIR in Info-Zip sources.
|
|
|
|
*/
|
|
|
|
typedef struct Win32dirent {
|
2014-11-04 00:26:53 +00:00
|
|
|
char d_attr;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
WCHAR d_name[MAX_PATH];
|
2014-11-04 00:26:53 +00:00
|
|
|
int d_first;
|
|
|
|
HANDLE d_hFindFile;
|
2007-03-27 17:47:10 +00:00
|
|
|
} Win32dirent;
|
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
static const WCHAR kWildMatchAll[] = L"*.*";
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
Win32dirent* GenericArchive::OpenDir(const WCHAR* name)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-18 05:13:13 +00:00
|
|
|
Win32dirent* dir = NULL;
|
|
|
|
WCHAR* tmpStr = NULL;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
WCHAR* cp;
|
2014-11-04 00:26:53 +00:00
|
|
|
WIN32_FIND_DATA fnd;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
dir = (Win32dirent*) malloc(sizeof(*dir));
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
tmpStr = (WCHAR*) malloc((wcslen(name) + 2 + wcslen(kWildMatchAll)) * sizeof(WCHAR));
|
2014-11-18 05:13:13 +00:00
|
|
|
if (dir == NULL || tmpStr == NULL)
|
2014-11-04 00:26:53 +00:00
|
|
|
goto failed;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(tmpStr, name);
|
|
|
|
cp = tmpStr + wcslen(tmpStr);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
/* don't end in a colon (e.g. "C:") */
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
if ((cp - tmpStr) > 0 && wcsrchr(tmpStr, ':') == (cp - 1))
|
2014-11-04 00:26:53 +00:00
|
|
|
*cp++ = '.';
|
|
|
|
/* must end in a slash */
|
|
|
|
if ((cp - tmpStr) > 0 &&
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcsrchr(tmpStr, PathProposal::kLocalFssep) != (cp - 1))
|
2014-11-04 00:26:53 +00:00
|
|
|
*cp++ = PathProposal::kLocalFssep;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(cp, kWildMatchAll);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
dir->d_hFindFile = FindFirstFile(tmpStr, &fnd);
|
|
|
|
if (dir->d_hFindFile == INVALID_HANDLE_VALUE)
|
|
|
|
goto failed;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(dir->d_name, fnd.cFileName);
|
2014-11-04 00:26:53 +00:00
|
|
|
dir->d_attr = (unsigned char) fnd.dwFileAttributes;
|
|
|
|
dir->d_first = 1;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
bail:
|
2014-11-04 00:26:53 +00:00
|
|
|
free(tmpStr);
|
|
|
|
return dir;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
failed:
|
2014-11-04 00:26:53 +00:00
|
|
|
free(dir);
|
2014-11-18 05:13:13 +00:00
|
|
|
dir = NULL;
|
2014-11-04 00:26:53 +00:00
|
|
|
goto bail;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
Win32dirent* GenericArchive::ReadDir(Win32dirent* dir)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
if (dir->d_first)
|
|
|
|
dir->d_first = 0;
|
|
|
|
else {
|
|
|
|
WIN32_FIND_DATA fnd;
|
|
|
|
|
|
|
|
if (!FindNextFile(dir->d_hFindFile, &fnd))
|
2014-11-18 05:13:13 +00:00
|
|
|
return NULL;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(dir->d_name, fnd.cFileName);
|
2014-11-04 00:26:53 +00:00
|
|
|
dir->d_attr = (unsigned char) fnd.dwFileAttributes;
|
|
|
|
}
|
|
|
|
|
|
|
|
return dir;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void GenericArchive::CloseDir(Win32dirent* dir)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-18 05:13:13 +00:00
|
|
|
if (dir == NULL)
|
2014-11-04 00:26:53 +00:00
|
|
|
return;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
FindClose(dir->d_hFindFile);
|
|
|
|
free(dir);
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
NuError GenericArchive::Win32AddDirectory(const AddFilesDialog* pAddOpts,
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
const WCHAR* dirName, CString* pErrMsg)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
NuError err = kNuErrNone;
|
2014-11-18 05:13:13 +00:00
|
|
|
Win32dirent* dirp = NULL;
|
2014-11-04 00:26:53 +00:00
|
|
|
Win32dirent* entry;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
WCHAR nbuf[MAX_PATH]; /* malloc might be better; this soaks stack */
|
2014-11-04 00:26:53 +00:00
|
|
|
char fssep;
|
|
|
|
int len;
|
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(pAddOpts != NULL);
|
|
|
|
ASSERT(dirName != NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("+++ DESCEND: '%ls'", dirName);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
dirp = OpenDir(dirName);
|
2014-11-18 05:13:13 +00:00
|
|
|
if (dirp == NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
if (errno == ENOTDIR)
|
|
|
|
err = kNuErrNotDir;
|
|
|
|
else
|
|
|
|
err = errno ? (NuError)errno : kNuErrOpenDir;
|
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
pErrMsg->Format(L"Failed on '%ls': %hs.", dirName, NuStrError(err));
|
2014-11-04 00:26:53 +00:00
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
|
|
|
|
fssep = PathProposal::kLocalFssep;
|
|
|
|
|
|
|
|
/* could use readdir_r, but we don't care about reentrancy here */
|
2014-11-18 05:13:13 +00:00
|
|
|
while ((entry = ReadDir(dirp)) != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
/* skip the dotsies */
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
if (wcscmp(entry->d_name, L".") == 0 ||
|
|
|
|
wcscmp(entry->d_name, L"..") == 0)
|
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
continue;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
}
|
2014-11-04 00:26:53 +00:00
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
len = wcslen(dirName);
|
|
|
|
if (len + wcslen(entry->d_name) +2 > MAX_PATH) {
|
2014-11-04 00:26:53 +00:00
|
|
|
err = kNuErrInternal;
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGE("ERROR: Filename exceeds %d bytes: %ls%c%ls",
|
2014-11-04 00:26:53 +00:00
|
|
|
MAX_PATH, dirName, fssep, entry->d_name);
|
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* form the new name, inserting an fssep if needed */
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(nbuf, dirName);
|
2014-11-04 00:26:53 +00:00
|
|
|
if (dirName[len-1] != fssep)
|
|
|
|
nbuf[len++] = fssep;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
wcscpy(nbuf+len, entry->d_name);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
err = Win32AddFile(pAddOpts, nbuf, pErrMsg);
|
|
|
|
if (err != kNuErrNone)
|
|
|
|
goto bail;
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
bail:
|
2014-11-18 05:13:13 +00:00
|
|
|
if (dirp != NULL)
|
2014-11-04 00:26:53 +00:00
|
|
|
(void)CloseDir(dirp);
|
|
|
|
return err;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
NuError GenericArchive::Win32AddFile(const AddFilesDialog* pAddOpts,
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
const WCHAR* pathname, CString* pErrMsg)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
NuError err = kNuErrNone;
|
2015-01-05 05:04:01 +00:00
|
|
|
bool exists, isDir, isReadable;
|
|
|
|
LocalFileDetails details;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
struct _stat sb;
|
2014-11-04 00:26:53 +00:00
|
|
|
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(pAddOpts != NULL);
|
|
|
|
ASSERT(pathname != NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
PathName checkPath(pathname);
|
|
|
|
int ierr = checkPath.CheckFileStatus(&sb, &exists, &isReadable, &isDir);
|
|
|
|
if (ierr != 0) {
|
|
|
|
err = kNuErrGeneric;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
pErrMsg->Format(L"Unexpected error while examining '%ls': %hs.",
|
|
|
|
pathname, NuStrError((NuError) ierr));
|
2014-11-04 00:26:53 +00:00
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!exists) {
|
|
|
|
err = kNuErrFileNotFound;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
pErrMsg->Format(L"Couldn't find '%ls'", pathname);
|
2014-11-04 00:26:53 +00:00
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
if (!isReadable) {
|
|
|
|
err = kNuErrFileNotReadable;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
pErrMsg->Format(L"File '%ls' isn't readable.", pathname);
|
2014-11-04 00:26:53 +00:00
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
if (isDir) {
|
|
|
|
if (pAddOpts->fIncludeSubfolders)
|
|
|
|
err = Win32AddDirectory(pAddOpts, pathname, pErrMsg);
|
|
|
|
goto bail;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We've found a file that we want to add. We need to decide what
|
|
|
|
* filetype and auxtype it has, and whether or not it's actually the
|
|
|
|
* resource fork of another file.
|
|
|
|
*/
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("+++ ADD '%ls'", pathname);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
/*
|
2015-01-05 05:04:01 +00:00
|
|
|
* Fill out the "details" structure.
|
2014-11-04 00:26:53 +00:00
|
|
|
*/
|
2015-01-05 05:04:01 +00:00
|
|
|
err = details.SetFields(pAddOpts, pathname, &sb);
|
2014-11-04 00:26:53 +00:00
|
|
|
if (err != kNuErrNone)
|
|
|
|
goto bail;
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
assert(wcscmp(pathname, details.GetLocalPathName()) == 0);
|
2014-11-04 00:26:53 +00:00
|
|
|
err = DoAddFile(pAddOpts, &details);
|
|
|
|
if (err == kNuErrSkipped) // ignore "skipped" result
|
|
|
|
err = kNuErrNone;
|
|
|
|
if (err != kNuErrNone)
|
|
|
|
goto bail;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
|
|
|
bail:
|
2014-11-04 00:26:53 +00:00
|
|
|
if (err != kNuErrNone && pErrMsg->IsEmpty()) {
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
pErrMsg->Format(L"Unable to add file '%ls': %hs.",
|
2014-11-04 00:26:53 +00:00
|
|
|
pathname, NuStrError(err));
|
|
|
|
}
|
|
|
|
return err;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
NuError GenericArchive::AddFile(const AddFilesDialog* pAddOpts,
|
|
|
|
const WCHAR* pathname, CString* pErrMsg)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-21 21:18:20 +00:00
|
|
|
*pErrMsg = L"";
|
2014-11-04 00:26:53 +00:00
|
|
|
return Win32AddFile(pAddOpts, pathname, pErrMsg);
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
|
2007-03-27 17:47:10 +00:00
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2014-11-04 00:26:53 +00:00
|
|
|
* GenericArchive::FileDetails
|
2007-03-27 17:47:10 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
GenericArchive::LocalFileDetails::LocalFileDetails(void)
|
|
|
|
: fEntryKind(kFileKindUnknown),
|
|
|
|
fFileSysFmt(DiskImg::kFormatUnknown),
|
|
|
|
fFssep('\0'),
|
|
|
|
fFileType(0),
|
|
|
|
fExtraType(0),
|
|
|
|
fAccess(0),
|
|
|
|
fStorageType(0)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-05 05:04:01 +00:00
|
|
|
memset(&fCreateWhen, 0, sizeof(fCreateWhen));
|
|
|
|
memset(&fModWhen, 0, sizeof(fModWhen));
|
|
|
|
memset(&fArchiveWhen, 0, sizeof(fArchiveWhen));
|
|
|
|
|
|
|
|
// set these for debugging
|
|
|
|
memset(&fNuFileDetails, 0xcc, sizeof(fNuFileDetails));
|
|
|
|
memset(&fCreateParms, 0xcc, sizeof(&fCreateParms));
|
|
|
|
fStoragePathNameMOR = "!INIT!";
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
NuError GenericArchive::LocalFileDetails::SetFields(const AddFilesDialog* pAddOpts,
|
|
|
|
const WCHAR* pathname, struct _stat* psb)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-05 05:04:01 +00:00
|
|
|
time_t now;
|
|
|
|
|
|
|
|
ASSERT(pAddOpts != NULL);
|
|
|
|
ASSERT(pathname != NULL);
|
|
|
|
|
|
|
|
/* get adjusted filename, along with any preserved type info */
|
|
|
|
PathProposal pathProp;
|
|
|
|
pathProp.Init(pathname);
|
|
|
|
pathProp.LocalToArchive(pAddOpts);
|
|
|
|
|
|
|
|
/* set up the local and archived pathnames */
|
|
|
|
fLocalPathName = pathname;
|
|
|
|
fStrippedLocalPathName = L"";
|
|
|
|
if (!pAddOpts->fStoragePrefix.IsEmpty()) {
|
|
|
|
fStrippedLocalPathName += pAddOpts->fStoragePrefix;
|
|
|
|
fStrippedLocalPathName += pathProp.fStoredFssep;
|
|
|
|
}
|
|
|
|
fStrippedLocalPathName += pathProp.fStoredPathName;
|
|
|
|
GenerateStoragePathName();
|
|
|
|
|
|
|
|
fFileSysFmt = DiskImg::kFormatUnknown;
|
|
|
|
fStorageType = kNuStorageUnknown; /* let NufxLib et.al. worry about it */
|
|
|
|
if (psb->st_mode & S_IWUSR)
|
|
|
|
fAccess = kNuAccessUnlocked;
|
|
|
|
else
|
|
|
|
fAccess = kNuAccessLocked;
|
|
|
|
fEntryKind = LocalFileDetails::kFileKindDataFork;
|
|
|
|
fFssep = pathProp.fStoredFssep;
|
|
|
|
fFileType = pathProp.fFileType;
|
|
|
|
fExtraType = pathProp.fAuxType;
|
|
|
|
|
|
|
|
#if 0
|
|
|
|
/* if this is a disk image, fill in disk-specific fields */
|
|
|
|
if (NState_GetModAddAsDisk(pState)) {
|
|
|
|
if ((psb->st_size & 0x1ff) != 0) {
|
|
|
|
/* reject anything whose size isn't a multiple of 512 bytes */
|
|
|
|
printf("NOT storing odd-sized (%ld) file as disk image: %ls\n",
|
|
|
|
(long)psb->st_size, livePathStr);
|
|
|
|
} else {
|
|
|
|
/* set fields; note the "preserve" stuff can override this */
|
|
|
|
pDetails->threadID = kNuThreadIDDiskImage;
|
|
|
|
pDetails->storageType = 512;
|
|
|
|
pDetails->extraType = psb->st_size / 512;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
now = time(NULL);
|
|
|
|
UNIXTimeToDateTime(&now, &fArchiveWhen);
|
|
|
|
UNIXTimeToDateTime(&psb->st_mtime, &fModWhen);
|
|
|
|
UNIXTimeToDateTime(&psb->st_ctime, &fCreateWhen);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
switch (pathProp.fThreadKind) {
|
|
|
|
case GenericEntry::kDataThread:
|
|
|
|
//pDetails->threadID = kNuThreadIDDataFork;
|
|
|
|
fEntryKind = LocalFileDetails::kFileKindDataFork;
|
|
|
|
break;
|
|
|
|
case GenericEntry::kRsrcThread:
|
|
|
|
//pDetails->threadID = kNuThreadIDRsrcFork;
|
|
|
|
fEntryKind = LocalFileDetails::kFileKindRsrcFork;
|
|
|
|
break;
|
|
|
|
case GenericEntry::kDiskImageThread:
|
|
|
|
//pDetails->threadID = kNuThreadIDDiskImage;
|
|
|
|
fEntryKind = LocalFileDetails::kFileKindDiskImage;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
ASSERT(false);
|
|
|
|
// was initialized to default earlier
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*bail:*/
|
|
|
|
return kNuErrNone;
|
|
|
|
}
|
|
|
|
|
|
|
|
const NuFileDetails& GenericArchive::LocalFileDetails::GetNuFileDetails()
|
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
//details.threadID = threadID;
|
2015-01-05 05:04:01 +00:00
|
|
|
switch (fEntryKind) {
|
2014-11-04 00:26:53 +00:00
|
|
|
case kFileKindDataFork:
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.threadID = kNuThreadIDDataFork;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
case kFileKindBothForks: // not exactly supported, doesn't really matter
|
|
|
|
case kFileKindRsrcFork:
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.threadID = kNuThreadIDRsrcFork;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
case kFileKindDiskImage:
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.threadID = kNuThreadIDDiskImage;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
case kFileKindDirectory:
|
|
|
|
default:
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGW("Invalid entryKind (%d) for NuFileDetails conversion", fEntryKind);
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(false);
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.threadID = 0; // that makes it an old-style comment?!
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.origName = (LPCWSTR) fLocalPathName;
|
|
|
|
fNuFileDetails.storageNameMOR = (LPCSTR) fStoragePathNameMOR;
|
|
|
|
fNuFileDetails.fileSysInfo = fFssep;
|
|
|
|
fNuFileDetails.access = fAccess;
|
|
|
|
fNuFileDetails.fileType = fFileType;
|
|
|
|
fNuFileDetails.extraType = fExtraType;
|
|
|
|
fNuFileDetails.storageType = fStorageType;
|
|
|
|
fNuFileDetails.createWhen = fCreateWhen;
|
|
|
|
fNuFileDetails.modWhen = fModWhen;
|
|
|
|
fNuFileDetails.archiveWhen = fArchiveWhen;
|
|
|
|
|
|
|
|
switch (fFileSysFmt) {
|
2014-11-04 00:26:53 +00:00
|
|
|
case DiskImg::kFormatProDOS:
|
|
|
|
case DiskImg::kFormatDOS33:
|
|
|
|
case DiskImg::kFormatDOS32:
|
|
|
|
case DiskImg::kFormatPascal:
|
|
|
|
case DiskImg::kFormatMacHFS:
|
|
|
|
case DiskImg::kFormatMacMFS:
|
|
|
|
case DiskImg::kFormatLisa:
|
|
|
|
case DiskImg::kFormatCPM:
|
|
|
|
//kFormatCharFST
|
|
|
|
case DiskImg::kFormatMSDOS:
|
|
|
|
//kFormatHighSierra
|
|
|
|
case DiskImg::kFormatISO9660:
|
|
|
|
/* these map directly */
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.fileSysID = (enum NuFileSysID) fFileSysFmt;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case DiskImg::kFormatRDOS33:
|
|
|
|
case DiskImg::kFormatRDOS32:
|
|
|
|
case DiskImg::kFormatRDOS3:
|
|
|
|
/* these look like DOS33, e.g. text is high-ASCII */
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.fileSysID = kNuFileSysDOS33;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2015-01-05 05:04:01 +00:00
|
|
|
fNuFileDetails.fileSysID = kNuFileSysUnknown;
|
2014-11-04 00:26:53 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
return fNuFileDetails;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
const DiskFS::CreateParms& GenericArchive::LocalFileDetails::GetCreateParms()
|
|
|
|
{
|
|
|
|
fCreateParms.pathName = (LPCSTR) fStoragePathNameMOR;
|
|
|
|
fCreateParms.fssep = fFssep;
|
|
|
|
fCreateParms.storageType = fStorageType;
|
|
|
|
fCreateParms.fileType = fFileType;
|
|
|
|
fCreateParms.auxType = fExtraType;
|
|
|
|
fCreateParms.access = fAccess;
|
|
|
|
fCreateParms.createWhen = NufxArchive::DateTimeToSeconds(&fCreateWhen);
|
|
|
|
fCreateParms.modWhen = NufxArchive::DateTimeToSeconds(&fModWhen);
|
|
|
|
return fCreateParms;
|
|
|
|
}
|
|
|
|
|
|
|
|
void GenericArchive::LocalFileDetails::GenerateStoragePathName()
|
|
|
|
{
|
|
|
|
// TODO(Unicode): generate MOR name from Unicode, instead of just
|
|
|
|
// doing a generic CP-1252 conversion. We need to do this on both
|
|
|
|
// sides though, so until we can extract MOR->Unicode we don't
|
|
|
|
// want to add Unicode->MOR. And it all depends on NufxLib and
|
|
|
|
// DiskImg being able to handle UTF-16 filenames.
|
|
|
|
fStoragePathNameMOR = fStrippedLocalPathName;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*static*/ void GenericArchive::LocalFileDetails::CopyFields(LocalFileDetails* pDst,
|
|
|
|
const LocalFileDetails* pSrc)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-05 05:04:01 +00:00
|
|
|
// don't copy fNuFileDetails, fCreateParms
|
|
|
|
pDst->fEntryKind = pSrc->fEntryKind;
|
|
|
|
pDst->fLocalPathName = pSrc->fLocalPathName;
|
|
|
|
pDst->fStrippedLocalPathName = pSrc->fStrippedLocalPathName;
|
|
|
|
pDst->fStoragePathNameMOR = pSrc->fStoragePathNameMOR;
|
|
|
|
pDst->fFileSysFmt = pSrc->fFileSysFmt;
|
|
|
|
pDst->fFssep = pSrc->fFssep;
|
|
|
|
pDst->fAccess = pSrc->fAccess;
|
|
|
|
pDst->fFileType = pSrc->fFileType;
|
|
|
|
pDst->fExtraType = pSrc->fExtraType;
|
|
|
|
pDst->fStorageType = pSrc->fStorageType;
|
|
|
|
pDst->fCreateWhen = pSrc->fCreateWhen;
|
|
|
|
pDst->fModWhen = pSrc->fModWhen;
|
|
|
|
pDst->fArchiveWhen = pSrc->fArchiveWhen;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* ===========================================================================
|
2014-11-04 00:26:53 +00:00
|
|
|
* SelectionSet
|
2007-03-27 17:47:10 +00:00
|
|
|
* ===========================================================================
|
|
|
|
*/
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::CreateFromSelection(ContentList* pContentList, int threadMask)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-21 21:18:20 +00:00
|
|
|
/*
|
|
|
|
* This grabs the items in the order in which they appear in the display
|
|
|
|
* (at least under Win2K), which is a good thing. It appears that, if you
|
|
|
|
* just grab indices 0..N, you will get them in order.
|
|
|
|
*/
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("CreateFromSelection (threadMask=0x%02x)", threadMask);
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
POSITION posn;
|
|
|
|
posn = pContentList->GetFirstSelectedItemPosition();
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(posn != NULL);
|
|
|
|
if (posn == NULL)
|
2014-11-04 00:26:53 +00:00
|
|
|
return;
|
2014-11-18 05:13:13 +00:00
|
|
|
while (posn != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
int num = pContentList->GetNextSelectedItem(/*ref*/ posn);
|
|
|
|
GenericEntry* pEntry = (GenericEntry*) pContentList->GetItemData(num);
|
|
|
|
|
|
|
|
AddToSet(pEntry, threadMask);
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::CreateFromAll(ContentList* pContentList, int threadMask)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("CreateFromAll (threadMask=0x%02x)", threadMask);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
int count = pContentList->GetItemCount();
|
|
|
|
for (int idx = 0; idx < count; idx++) {
|
|
|
|
GenericEntry* pEntry = (GenericEntry*) pContentList->GetItemData(idx);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
AddToSet(pEntry, threadMask);
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::AddToSet(GenericEntry* pEntry, int threadMask)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
SelectionEntry* pSelEntry;
|
|
|
|
|
2015-01-09 01:41:53 +00:00
|
|
|
LOGV(" Sel '%ls'", (LPCWSTR) pEntry->GetPathNameUNI());
|
2014-11-04 00:26:53 +00:00
|
|
|
|
|
|
|
if (!(threadMask & GenericEntry::kAllowVolumeDir) &&
|
|
|
|
pEntry->GetRecordKind() == GenericEntry::kRecordKindVolumeDir)
|
|
|
|
{
|
|
|
|
/* only include volume dir if specifically requested */
|
2014-11-18 21:05:15 +00:00
|
|
|
//LOGI(" Excluding volume dir '%ls' from set", pEntry->GetPathName());
|
2014-11-04 00:26:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(threadMask & GenericEntry::kAllowDirectory) &&
|
|
|
|
pEntry->GetRecordKind() == GenericEntry::kRecordKindDirectory)
|
|
|
|
{
|
|
|
|
/* only include directories if specifically requested */
|
2014-11-18 21:05:15 +00:00
|
|
|
//LOGI(" Excluding folder '%ls' from set", pEntry->GetPathName());
|
2014-11-04 00:26:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(threadMask & GenericEntry::kAllowDamaged) && pEntry->GetDamaged())
|
|
|
|
{
|
|
|
|
/* only include "damaged" files if specifically requested */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool doAdd = false;
|
|
|
|
|
|
|
|
if (threadMask & GenericEntry::kAnyThread)
|
|
|
|
doAdd = true;
|
|
|
|
|
|
|
|
if ((threadMask & GenericEntry::kCommentThread) && pEntry->GetHasComment())
|
|
|
|
doAdd = true;
|
|
|
|
if ((threadMask & GenericEntry::kDataThread) && pEntry->GetHasDataFork())
|
|
|
|
doAdd = true;
|
|
|
|
if ((threadMask & GenericEntry::kRsrcThread) && pEntry->GetHasRsrcFork())
|
|
|
|
doAdd = true;
|
|
|
|
if ((threadMask & GenericEntry::kDiskImageThread) && pEntry->GetHasDiskImage())
|
|
|
|
doAdd = true;
|
|
|
|
|
|
|
|
if (doAdd) {
|
|
|
|
pSelEntry = new SelectionEntry(pEntry);
|
|
|
|
AddEntry(pSelEntry);
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::AddEntry(SelectionEntry* pEntry)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-18 05:13:13 +00:00
|
|
|
if (fEntryHead == NULL) {
|
|
|
|
ASSERT(fEntryTail == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryHead = pEntry;
|
|
|
|
fEntryTail = pEntry;
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(pEntry->GetPrev() == NULL);
|
|
|
|
ASSERT(pEntry->GetNext() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
} else {
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(fEntryTail != NULL);
|
|
|
|
ASSERT(pEntry->GetPrev() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry->SetPrev(fEntryTail);
|
2014-11-18 05:13:13 +00:00
|
|
|
ASSERT(fEntryTail->GetNext() == NULL);
|
2014-11-04 00:26:53 +00:00
|
|
|
fEntryTail->SetNext(pEntry);
|
|
|
|
fEntryTail = pEntry;
|
|
|
|
}
|
|
|
|
|
|
|
|
fNumEntries++;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::DeleteEntries(void)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
SelectionEntry* pEntry;
|
|
|
|
SelectionEntry* pNext;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2015-01-05 05:04:01 +00:00
|
|
|
LOGD("Deleting selection entries");
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = GetEntries();
|
2014-11-18 05:13:13 +00:00
|
|
|
while (pEntry != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
pNext = pEntry->GetNext();
|
|
|
|
delete pEntry;
|
|
|
|
pEntry = pNext;
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
int SelectionSet::CountMatchingPrefix(const WCHAR* prefix)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
SelectionEntry* pEntry;
|
|
|
|
int count = 0;
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
int len = wcslen(prefix);
|
2014-11-04 00:26:53 +00:00
|
|
|
ASSERT(len > 0);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = GetEntries();
|
2014-11-18 05:13:13 +00:00
|
|
|
while (pEntry != NULL) {
|
2014-11-04 00:26:53 +00:00
|
|
|
GenericEntry* pGeneric = pEntry->GetEntry();
|
2007-03-27 17:47:10 +00:00
|
|
|
|
Large set of changes to restore CiderPress build.
CiderPress and MDC now compile, and execute far enough to open
their respective "about" boxes, but I doubt they'll do much
more than that.
* Switch from MBCS to UNICODE APIs
Microsoft switched to UTF-16 (by way of UCS-2) a long time ago,
and the support for MBCS seems to be getting phased out. So it's
time to switch to wide strings.
This is a bit awkward for CiderPress because it works with disk
and file archives with 8-bit filenames, and I want NufxLib and
DiskImgLib to continue to work on Linux (which has largely taken
the UTF-8 approach to Unicode). The libraries will continue to
work with 8-bit filenames, with CiderPress/MDC doing the
conversion at the appropriate point.
There were a couple of places where strings from a structure
handed back by one of the libraries were used directly in the UI,
or vice-versa, which is a problem because we have nowhere to
store the result of the conversion. These currently have fixed
place-holder "xyzzy" strings.
All UI strings are now wide.
Various format strings now use "%ls" and "%hs" to explicitly
specify wide and narrow. This doesn't play well with gcc, so
only the Windows-specific parts use those.
* Various updates to vcxproj files
The project-file conversion had some cruft that is now largely
gone. The build now has a common output directory for the EXEs
and libraries, avoiding the old post-build copy steps.
* Added zlib 1.2.8 and nufxlib 2.2.2 source snapshots
The old "prebuilts" directory is now gone. The libraries are now
built as part of building the apps.
I added a minimal set of files for zlib, and a full set for nufxlib.
The Linux-specific nufxlib goodies are included for the benefit of
the Linux utilities, which are currently broken (don't build).
* Replace symbols used for include guards
Symbols with a leading "__" are reserved.
2014-11-10 23:32:55 +00:00
|
|
|
if (wcsnicmp(prefix, pGeneric->GetDisplayName(), len) == 0)
|
2014-11-04 00:26:53 +00:00
|
|
|
count++;
|
|
|
|
pEntry = pEntry->GetNext();
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
return count;
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|
|
|
|
|
2014-11-21 21:18:20 +00:00
|
|
|
void SelectionSet::Dump(void)
|
2007-03-27 17:47:10 +00:00
|
|
|
{
|
2014-11-04 00:26:53 +00:00
|
|
|
const SelectionEntry* pEntry;
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-18 21:05:15 +00:00
|
|
|
LOGI("SelectionSet: %d entries", fNumEntries);
|
2007-03-27 17:47:10 +00:00
|
|
|
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = fEntryHead;
|
2014-11-18 05:13:13 +00:00
|
|
|
while (pEntry != NULL) {
|
2015-01-09 01:41:53 +00:00
|
|
|
LOGI(" : name='%ls'", (LPCWSTR) pEntry->GetEntry()->GetPathNameUNI());
|
2014-11-04 00:26:53 +00:00
|
|
|
pEntry = pEntry->GetNext();
|
|
|
|
}
|
2007-03-27 17:47:10 +00:00
|
|
|
}
|