X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/6fd51a5f4300f4b1563cdf2a34f59e6bbaacb838..d27daedb6a0bf672508072100f20233d08ccf0e0:/apt-pkg/contrib/cmndline.cc?ds=sidebyside diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index 2086d91ca..c8a6e2787 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -18,6 +18,11 @@ #include #include +#include +#include +#include +#include + #include /*}}}*/ using namespace std; @@ -28,6 +33,9 @@ using namespace std; CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList), Conf(Conf), FileList(0) { +} +CommandLine::CommandLine() : ArgList(NULL), Conf(NULL), FileList(0) +{ } /*}}}*/ // CommandLine::~CommandLine - Destructor /*{{{*/ @@ -42,23 +50,26 @@ CommandLine::~CommandLine() char const * CommandLine::GetCommand(Dispatch const * const Map, unsigned int const argc, char const * const * const argv) { - // if there is a -- on the line there must be the word we search for around it - // as -- marks the end of the options, just not sure if the command can be - // considered an option or not, so accept both + // if there is a -- on the line there must be the word we search for either + // before it (as -- marks the end of the options) or right after it (as we can't + // decide if the command is actually an option, given that in theory, you could + // have parameters named like commands) for (size_t i = 1; i < argc; ++i) { if (strcmp(argv[i], "--") != 0) continue; - ++i; - if (i < argc) + // check if command is before -- + for (size_t k = 1; k < i; ++k) for (size_t j = 0; Map[j].Match != NULL; ++j) - if (strcmp(argv[i], Map[j].Match) == 0) + if (strcmp(argv[k], Map[j].Match) == 0) return Map[j].Match; - i -= 2; - if (i != 0) + // see if the next token after -- is the command + ++i; + if (i < argc) for (size_t j = 0; Map[j].Match != NULL; ++j) if (strcmp(argv[i], Map[j].Match) == 0) return Map[j].Match; + // we found a --, but not a command return NULL; } // no --, so search for the first word matching a command @@ -113,7 +124,7 @@ bool CommandLine::Parse(int argc,const char **argv) Args *A; for (A = ArgList; A->end() == false && A->ShortOpt != *Opt; A++); if (A->end() == true) - return _error->Error(_("Command line option '%c' [from %s] is not known."),*Opt,argv[I]); + return _error->Error(_("Command line option '%c' [from %s] is not understood in combination with the other options."),*Opt,argv[I]); if (HandleOpt(I,argc,argv,Opt,A) == false) return false; @@ -138,7 +149,7 @@ bool CommandLine::Parse(int argc,const char **argv) { Opt = (const char*) memchr(Opt, '-', OptEnd - Opt); if (Opt == NULL) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); Opt++; for (A = ArgList; A->end() == false && @@ -147,7 +158,7 @@ bool CommandLine::Parse(int argc,const char **argv) // Failed again.. if (A->end() == true && OptEnd - Opt != 1) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); // The option could be a single letter option prefixed by a no-.. if (A->end() == true) @@ -155,7 +166,7 @@ bool CommandLine::Parse(int argc,const char **argv) for (A = ArgList; A->end() == false && A->ShortOpt != *Opt; A++); if (A->end() == true) - return _error->Error(_("Command line option %s is not understood"),argv[I]); + return _error->Error(_("Command line option %s is not understood in combination with the other options"),argv[I]); } // The option is not boolean @@ -194,17 +205,11 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], /* Determine the possible location of an option or 0 if their is no option */ - if (Opt[1] == 0 || (Opt[1] == '=' && Opt[2] == 0)) + if (Opt[1] == 0) { if (I + 1 < argc && argv[I+1][0] != '-') Argument = argv[I+1]; - - // Equals was specified but we fell off the end! - if (Opt[1] == '=' && Argument == 0) - return _error->Error(_("Option %s requires an argument."),argv[I]); - if (Opt[1] == '=') - CertainArg = true; - + IncI = 1; } else @@ -233,20 +238,11 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], // Arbitrary item specification if ((A->Flags & ArbItem) == ArbItem) { - const char *J = strchr(Argument, '='); - if (J == NULL) + const char * const J = strchr(Argument, '='); + if (J == nullptr) return _error->Error(_("Option %s: Configuration item specification must have an =."),argv[I]); - // = is trailing - if (J[1] == 0) - { - if (I+1 >= argc) - return _error->Error(_("Option %s: Configuration item specification must have an =."),argv[I]); - Conf->Set(string(Argument,J-Argument),string(argv[I++ +1])); - } - else - Conf->Set(string(Argument,J-Argument),string(J+1)); - + Conf->Set(string(Argument,J-Argument), J+1); return true; } @@ -293,7 +289,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[], // Look for an argument. while (1) { - // Look at preceeding text + // Look at preceding text char Buffer[300]; if (Argument == 0) { @@ -363,9 +359,7 @@ unsigned int CommandLine::FileSize() const } /*}}}*/ // CommandLine::DispatchArg - Do something with the first arg /*{{{*/ -// --------------------------------------------------------------------- -/* */ -bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) +bool CommandLine::DispatchArg(Dispatch const * const Map,bool NoMatch) { int I; for (I = 0; Map[I].Match != 0; I++) @@ -387,6 +381,11 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) } return false; +} +bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) +{ + Dispatch const * const Map2 = Map; + return DispatchArg(Map2, NoMatch); } /*}}}*/ // CommandLine::SaveInConfig - for output later in a logfile or so /*{{{*/