reorder includes: add <config.h> if needed and include it at first

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 94ca4dc70f8e041e545c1c429d12f4c223774c10..34e90da207c0578cf02d4368f4de066f0b4fa33e 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,20 +1,25 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cmndline.cc,v 1.4 1998/10/20 02:39:25 jgg Exp $
+// $Id: cmndline.cc,v 1.15 2003/02/10 01:40:58 doogie Exp $

 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
    
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
    

+   This source is placed in the Public Domain, do with it what you will
+   It was originally written by Jason Gunthorpe <jgg@debian.org>.
+   

    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cmndline.h"
-#endif
+#include<config.h>
+

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

-#include <strutl.h>
+#include <apt-pkg/strutl.h>
+
+#include <apti18n.h>

                                                                        /*}}}*/
                                                                        /*}}}*/

+using namespace std;

 
 // CommandLine::CommandLine - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 
 // CommandLine::CommandLine - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------


@@ -56,7 +61,10 @@ bool CommandLine::Parse(int argc,const char **argv)
       
       // Double dash signifies the end of option processing
       if (*Opt == '-' && Opt[1] == 0)
       
       // Double dash signifies the end of option processing
       if (*Opt == '-' && Opt[1] == 0)

+      {
+        I++;

         break;
         break;

+      }

       
       // Single dash is a short option
       if (*Opt != '-')
       
       // Single dash is a short option
       if (*Opt != '-')


@@ -68,7 +76,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 known."),*Opt,argv[I]);

 
            if (HandleOpt(I,argc,argv,Opt,A) == false)
               return false;
 
            if (HandleOpt(I,argc,argv,Opt,A) == false)
               return false;


@@ -88,12 +96,13 @@ bool CommandLine::Parse(int argc,const char **argv)
           stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
       
       // Failed, look for a word after the first - (no-foo)
           stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
       
       // 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)
       if (A->end() == true)
       {
         for (; Opt != OptEnd && *Opt != '-'; Opt++);
 
         if (Opt == OptEnd)

-           return _error->Error("Command line option %s is not understood",argv[I]);
+           return _error->Error(_("Command line option %s is not understood"),argv[I]);

         Opt++;
         
         for (A = ArgList; A->end() == false &&
         Opt++;
         
         for (A = ArgList; A->end() == false &&


@@ -101,22 +110,26 @@ bool CommandLine::Parse(int argc,const char **argv)
 
         // 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"),argv[I]);
+

         // The option could be a single letter option prefixed by a no-..
         // The option could be a single letter option prefixed by a no-..

-        for (A = ArgList; A->end() == false && A->ShortOpt != *Opt; A++);
-        

         if (A->end() == true)
         if (A->end() == true)

-           return _error->Error("Command line option %s is not understood",argv[I]);
+        {
+           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]);
+        }

         
         // The option is not boolean
         if (A->IsBoolean() == false)
         
         // The option is not boolean
         if (A->IsBoolean() == false)

-           return _error->Error("Command line option %s is not boolean",argv[I]);
+           return _error->Error(_("Command line option %s is not boolean"),argv[I]);
+        PreceedMatch = true;

       }
       
       // Deal with it.
       OptEnd--;
       }
       
       // Deal with it.
       OptEnd--;

-      if (HandleOpt(I,argc,argv,OptEnd,A) == false)
+      if (HandleOpt(I,argc,argv,OptEnd,A,PreceedMatch) == false)

         return false;
    }
    
         return false;
    }
    


@@ -124,7 +137,9 @@ bool CommandLine::Parse(int argc,const char **argv)
    for (; I != argc; I++)
       *Files++ = argv[I];
    *Files = 0;
    for (; I != argc; I++)
       *Files++ = argv[I];
    *Files = 0;

-   
+
+   SaveInConfig(argc, argv);
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -134,7 +149,7 @@ bool CommandLine::Parse(int argc,const char **argv)
    and looks for specific patterns in the string, it gets tokanized
    -ruffly- like -*[yes|true|enable]-(o|longopt)[=][ ][argument] */
 bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    and looks for specific patterns in the string, it gets tokanized
    -ruffly- like -*[yes|true|enable]-(o|longopt)[=][ ][argument] */
 bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],

-                           const char *&Opt,Args *A)
+                           const char *&Opt,Args *A,bool PreceedMatch)

 {
    const char *Argument = 0;
    bool CertainArg = false;
 {
    const char *Argument = 0;
    bool CertainArg = false;


@@ -149,7 +164,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       
       // Equals was specified but we fell off the end!
       if (Opt[1] == '=' && Argument == 0)
       
       // Equals was specified but we fell off the end!
       if (Opt[1] == '=' && Argument == 0)

-        return _error->Error("Option %s requires an argument.",argv[I]);
+        return _error->Error(_("Option %s requires an argument."),argv[I]);

       if (Opt[1] == '=')
         CertainArg = true;
         
       if (Opt[1] == '=')
         CertainArg = true;
         


@@ -165,12 +180,12 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       else
         Argument = Opt + 1;
    }
       else
         Argument = Opt + 1;
    }

-
+   

    // Option is an argument set
    if ((A->Flags & HasArg) == HasArg)
    {
       if (Argument == 0)
    // Option is an argument set
    if ((A->Flags & HasArg) == HasArg)
    {
       if (Argument == 0)

-        return _error->Error("Option %s requires an argument.",argv[I]);
+        return _error->Error(_("Option %s requires an argument."),argv[I]);

       Opt += strlen(Opt);
       I += IncI;
       
       Opt += strlen(Opt);
       I += IncI;
       


@@ -178,19 +193,19 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 

-      // Arbitary item specification
+      // Arbitrary item specification

       if ((A->Flags & ArbItem) == ArbItem)
       {
         const char *J;
         for (J = Argument; *J != 0 && *J != '='; J++);
         if (*J == 0)
       if ((A->Flags & ArbItem) == ArbItem)
       {
         const char *J;
         for (J = Argument; *J != 0 && *J != '='; J++);
         if (*J == 0)

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

 
         // = is trailing
         if (J[1] == 0)
         {
            if (I+1 >= argc)
 
         // = is trailing
         if (J[1] == 0)
         {
            if (I+1 >= argc)

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

            Conf->Set(string(Argument,J-Argument),string(argv[I++ +1]));
         }
         else
            Conf->Set(string(Argument,J-Argument),string(argv[I++ +1]));
         }
         else


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

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

       return true;
    }
    
       return true;
    }
    


@@ -214,10 +235,10 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         
         // Conversion failed and the argument was specified with an =s
         if (EndPtr == Argument && CertainArg == true)
         
         // Conversion failed and the argument was specified with an =s
         if (EndPtr == Argument && CertainArg == true)

-           return _error->Error("Option %s requires an integer argument, not '%s'",argv[I],Argument);
+           return _error->Error(_("Option %s requires an integer argument, not '%s'"),argv[I],Argument);

 
         // Conversion was ok, set the value and return
 
         // Conversion was ok, set the value and return

-        if (EndPtr != Argument)
+        if (EndPtr != 0 && EndPtr != Argument && *EndPtr == 0)

         {
            Conf->Set(A->ConfName,Value);
            Opt += strlen(Opt);
         {
            Conf->Set(A->ConfName,Value);
            Opt += strlen(Opt);


@@ -241,11 +262,16 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       char Buffer[300];
       if (Argument == 0)
       {
       char Buffer[300];
       if (Argument == 0)
       {

-        if (strlen(argv[I]) >= sizeof(Buffer))
-           return _error->Error("Option '%s' is too long",argv[I]);
+        if (PreceedMatch == false)
+           break;

         
         

+        if (strlen(argv[I]) >= sizeof(Buffer))
+           return _error->Error(_("Option '%s' is too long"),argv[I]);
+
+        // Skip the leading dash

         const char *J = argv[I];
         for (; *J != 0 && *J == '-'; J++);
         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 = J;
         for (; *JEnd != 0 && *JEnd != '-'; JEnd++);
         if (*JEnd != 0)


@@ -273,7 +299,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       }
 
       if (CertainArg == true)
       }
 
       if (CertainArg == true)

-        return _error->Error("Sense %s is not understood, try true or false.",Argument);
+        return _error->Error(_("Sense %s is not understood, try true or false."),Argument);

       
       Argument = 0;
    }
       
       Argument = 0;
    }


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

-// CommandLine::FileSize - Count the number of filenames                                                                       /*{{{*/
+// CommandLine::FileSize - Count the number of filenames               /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 unsigned int CommandLine::FileSize() const
 // ---------------------------------------------------------------------
 /* */
 unsigned int CommandLine::FileSize() const


@@ -302,3 +328,68 @@ unsigned int CommandLine::FileSize() const
    return Count;
 }
                                                                        /*}}}*/
    return Count;
 }
                                                                        /*}}}*/

+// CommandLine::DispatchArg - Do something with the first arg          /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
+{
+   int I;
+   for (I = 0; Map[I].Match != 0; I++)
+   {
+      if (strcmp(FileList[0],Map[I].Match) == 0)
+      {
+        bool Res = Map[I].Handler(*this);
+        if (Res == false && _error->PendingError() == false)
+           _error->Error("Handler silently failed");
+        return Res;
+      }
+   }
+   
+   // No matching name
+   if (Map[I].Match == 0)
+   {
+      if (NoMatch == true)
+        _error->Error(_("Invalid operation %s"),FileList[0]);
+   }
+   
+   return false;
+}
+                                                                       /*}}}*/
+// CommandLine::SaveInConfig - for output later in a logfile or so     /*{{{*/
+// ---------------------------------------------------------------------
+/* We save the commandline here to have it around later for e.g. logging.
+   It feels a bit like a hack here and isn't bulletproof, but it is better
+   than nothing after all. */
+void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv)
+{
+   char cmdline[100 + argc * 50];
+   unsigned int length = 0;
+   bool lastWasOption = false;
+   bool closeQuote = false;
+   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)
+      {
+        cmdline[length] = argv[i][j];
+        if (lastWasOption == true && argv[i][j] == '=')
+        {
+           // 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;
+           cmdline[++length] = '"';
+           closeQuote = true;
+        }
+      }
+      if (closeQuote == true)
+        cmdline[length++] = '"';
+      // Problem: detects also --hello
+      if (cmdline[length-1] == 'o')
+        lastWasOption = true;
+      cmdline[length] = ' ';
+   }
+   cmdline[--length] = '\0';
+   _config->Set("CommandLine::AsString", cmdline);
+}
+                                                                       /*}}}*/