Merge branch 'feature/extractar-filefd' into debian/experimental

[apt.git] / apt-pkg / contrib / cmndline.cc

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 0b16bf51a5387d469d2a0857d510c3d0f0d9b0c3..40365237e39dfce9f4445ebc01fa946458c7f652 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -11,11 +11,19 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/

+#include<config.h>
+
+#include <apt-pkg/configuration.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 

-#include <apti18n.h>    
+#include <stddef.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+
+#include <apti18n.h>

                                                                        /*}}}*/
 using namespace std;
 
                                                                        /*}}}*/
 using namespace std;
 


@@ -25,6 +33,9 @@ using namespace std;
 CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList), 
                                  Conf(Conf), FileList(0)
 {
 CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList), 
                                  Conf(Conf), FileList(0)
 {

+}
+CommandLine::CommandLine() : ArgList(NULL), Conf(NULL), FileList(0)
+{

 }
                                                                        /*}}}*/
 // CommandLine::~CommandLine - Destructor                              /*{{{*/
 }
                                                                        /*}}}*/
 // CommandLine::~CommandLine - Destructor                              /*{{{*/


@@ -35,6 +46,45 @@ CommandLine::~CommandLine()
    delete [] FileList;
 }
                                                                        /*}}}*/
    delete [] FileList;
 }
                                                                        /*}}}*/

+// CommandLine::GetCommand - return the first non-option word          /*{{{*/
+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 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;
+      // 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[k], Map[j].Match) == 0)
+              return Map[j].Match;
+      // 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
+   // FIXME: How like is it that an option parameter will be also a valid Match ?
+   for (size_t i = 1; i < argc; ++i)
+   {
+      if (*(argv[i]) == '-')
+        continue;
+      for (size_t j = 0; Map[j].Match != NULL; ++j)
+        if (strcmp(argv[i], Map[j].Match) == 0)
+           return Map[j].Match;
+   }
+   return NULL;
+}
+                                                                       /*}}}*/

 // CommandLine::Parse - Main action member                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // CommandLine::Parse - Main action member                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -74,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)
            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;
 
            if (HandleOpt(I,argc,argv,Opt,A) == false)
               return false;


@@ -87,28 +137,28 @@ bool CommandLine::Parse(int argc,const char **argv)
       Opt++;
 
       // Match up to a = against the list
       Opt++;
 
       // Match up to a = against the list

-      const char *OptEnd = Opt;

       Args *A;
       Args *A;

-      for (; *OptEnd != 0 && *OptEnd != '='; OptEnd++);
-      for (A = ArgList; A->end() == false && 
-          stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
+      const char *OptEnd = strchrnul(Opt, '=');
+      for (A = ArgList; A->end() == false &&
+          (A->LongOpt == 0 || stringcasecmp(Opt,OptEnd,A->LongOpt) != 0);
+          ++A);

       
       // Failed, look for a word after the first - (no-foo)
       bool PreceedMatch = false;
       if (A->end() == true)
       {
       
       // Failed, look for a word after the first - (no-foo)
       bool PreceedMatch = false;
       if (A->end() == true)
       {

-        for (; Opt != OptEnd && *Opt != '-'; Opt++);
-
-        if (Opt == OptEnd)
-           return _error->Error(_("Command line option %s is not understood"),argv[I]);
+         Opt = (const char*) memchr(Opt, '-', OptEnd - Opt);
+        if (Opt == NULL)
+           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 &&
         Opt++;
         
         for (A = ArgList; A->end() == false &&

-             stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
+             (A->LongOpt == 0 || stringcasecmp(Opt,OptEnd,A->LongOpt) != 0);
+             ++A);

 
         // Failed again..
         if (A->end() == true && OptEnd - Opt != 1)
 
         // 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)
 
         // The option could be a single letter option prefixed by a no-..
         if (A->end() == true)


@@ -116,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)
            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
         }
         
         // The option is not boolean


@@ -194,9 +244,8 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       // Arbitrary item specification
       if ((A->Flags & ArbItem) == ArbItem)
       {
       // Arbitrary item specification
       if ((A->Flags & ArbItem) == ArbItem)
       {

-        const char *J;
-        for (J = Argument; *J != 0 && *J != '='; J++);
-        if (*J == 0)
+        const char *J = strchr(Argument, '=');
+        if (J == NULL)

            return _error->Error(_("Option %s: Configuration item specification must have an =<val>."),argv[I]);
 
         // = is trailing
            return _error->Error(_("Option %s: Configuration item specification must have an =<val>."),argv[I]);
 
         // = is trailing


@@ -212,8 +261,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         return true;
       }
       
         return true;
       }
       

-      const char *I = A->ConfName;
-      for (; *I != 0 && *I != ' '; I++);
+      const char *I = strchrnul(A->ConfName, ' ');

       if (*I == ' ')
         Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
       else
       if (*I == ' ')
         Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
       else


@@ -256,7 +304,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    // Look for an argument.
    while (1)
    {
    // Look for an argument.
    while (1)
    {

-      // Look at preceeding text
+      // Look at preceding text

       char Buffer[300];
       if (Argument == 0)
       {
       char Buffer[300];
       if (Argument == 0)
       {


@@ -269,10 +317,9 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         // Skip the leading dash
         const char *J = argv[I];
         for (; *J != 0 && *J == '-'; J++);
         // Skip the leading dash
         const char *J = argv[I];
         for (; *J != 0 && *J == '-'; J++);

-        
-        const char *JEnd = J;
-        for (; *JEnd != 0 && *JEnd != '-'; JEnd++);
-        if (*JEnd != 0)
+
+        const char *JEnd = strchr(J, '-');
+        if (JEnd != NULL)

         {
            strncpy(Buffer,J,JEnd - J);
            Buffer[JEnd - J] = 0;
         {
            strncpy(Buffer,J,JEnd - J);
            Buffer[JEnd - J] = 0;


@@ -360,11 +407,12 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
    than nothing after all. */
 void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv)
 {
    than nothing after all. */
 void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv)
 {

-   char cmdline[300];
+   char cmdline[100 + argc * 50];
+   memset(cmdline, 0, sizeof(cmdline));

    unsigned int length = 0;
    bool lastWasOption = false;
    bool closeQuote = false;
    unsigned int length = 0;
    bool lastWasOption = false;
    bool closeQuote = false;

-   for (unsigned int i = 0; i < argc; ++i, ++length)
+   for (unsigned int i = 0; i < argc && length < sizeof(cmdline); ++i, ++length)

    {
       for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length)
       {
    {
       for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length)
       {


@@ -373,9 +421,8 @@ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * co
         {
            // That is possibly an option: Quote it if it includes spaces,
            // the benefit is that this will eliminate also most false positives
         {
            // That is possibly an option: Quote it if it includes spaces,
            // the benefit is that this will eliminate also most false positives

-           const char* c = &argv[i][j+1];
-           for (; *c != '\0' && *c != ' '; ++c);
-           if (*c == '\0') continue;
+           const char* c = strchr(&argv[i][j+1], ' ');
+           if (c == NULL) continue;

            cmdline[++length] = '"';
            closeQuote = true;
         }
            cmdline[++length] = '"';
            closeQuote = true;
         }


@@ -391,3 +438,15 @@ void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * co
    _config->Set("CommandLine::AsString", cmdline);
 }
                                                                        /*}}}*/
    _config->Set("CommandLine::AsString", cmdline);
 }
                                                                        /*}}}*/

+CommandLine::Args CommandLine::MakeArgs(char ShortOpt, char const *LongOpt, char const *ConfName, unsigned long Flags)/*{{{*/
+{
+   /* In theory, this should be a constructor for CommandLine::Args instead,
+      but this breaks compatibility as gcc thinks this is a c++11 initializer_list */
+   CommandLine::Args arg;
+   arg.ShortOpt = ShortOpt;
+   arg.LongOpt = LongOpt;
+   arg.ConfName = ConfName;
+   arg.Flags = Flags;
+   return arg;
+}
+                                                                       /*}}}*/