4.35 beta

This commit is contained in:
Igor Pavlov
2006-03-03 00:00:00 +00:00
committed by Kornel Lesiński
parent 0f60a4933b
commit 191cf6781a
16 changed files with 156 additions and 53 deletions

View File

@@ -27,7 +27,7 @@ using namespace NCommandLineParser;
using namespace NWindows;
using namespace NFile;
static const int kNumSwitches = 26;
static const int kNumSwitches = 27;
namespace NKey {
enum Enum
@@ -57,7 +57,8 @@ enum Enum
kEmail,
kShowDialog,
kLargePages,
kCharSet
kCharSet,
kTechMode
};
}
@@ -121,7 +122,8 @@ static const CSwitchForm kSwitchForms[kNumSwitches] =
{ L"SEML", NSwitchType::kUnLimitedPostString, false, 0},
{ L"AD", NSwitchType::kSimple, false },
{ L"SLP", NSwitchType::kUnLimitedPostString, false, 0},
{ L"SCS", NSwitchType::kUnLimitedPostString, false, 0}
{ L"SCS", NSwitchType::kUnLimitedPostString, false, 0},
{ L"SLT", NSwitchType::kSimple, false }
};
static const int kNumCommandForms = 7;
@@ -236,7 +238,7 @@ static bool AddNameToCensor(NWildcard::CCensor &wildcardCensor,
return true;
}
static inline GetCurrentCodePage() { return ::AreFileApisANSI() ? CP_ACP : CP_OEMCP; }
static inline UINT GetCurrentCodePage() { return ::AreFileApisANSI() ? CP_ACP : CP_OEMCP; }
static void AddToCensorFromListFile(NWildcard::CCensor &wildcardCensor,
LPCWSTR fileName, bool include, NRecursedType::EEnum type, UINT codePage)
@@ -747,6 +749,8 @@ void CArchiveCommandLineParser::Parse2(CArchiveCommandLineOptions &options)
if (!ParseArchiveCommand(nonSwitchStrings[kCommandIndex], options.Command))
throw kUserErrorMessage;
options.TechMode = parser[NKey::kTechMode].ThereIs;
NRecursedType::EEnum recursedType;
if (parser[NKey::kRecursed].ThereIs)
recursedType = GetRecursedTypeFromIndex(parser[NKey::kRecursed].PostCharIndex);

View File

@@ -62,6 +62,7 @@ struct CArchiveCommandLineOptions
bool PasswordEnabled;
UString Password;
bool TechMode;
// Extract
bool AppendName;
UString OutputDir;