* merged with mainline

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 629b8e9e5c099e94cc2f9e0356d726f01cf410d9..2b3d7dc9626d59ef79375a5f1b0430041985a49c 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,10 +1,13 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cmndline.cc,v 1.7 1998/12/14 02:23:47 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                                                       /*{{{*/


@@ -13,8 +16,11 @@
 #endif
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #endif
 #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 +62,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 +77,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;


@@ -94,16 +103,15 @@ bool CommandLine::Parse(int argc,const char **argv)
         for (; Opt != OptEnd && *Opt != '-'; Opt++);
 
         if (Opt == OptEnd)
         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++;
         Opt++;

-        cout << Opt << endl;

         
         for (A = ArgList; A->end() == false &&
              stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
 
         // Failed again..
         if (A->end() == true && OptEnd - Opt != 1)
         
         for (A = ArgList; A->end() == false &&
              stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
 
         // 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-..
         if (A->end() == true)
 
         // The option could be a single letter option prefixed by a no-..
         if (A->end() == true)


@@ -111,12 +119,12 @@ 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"),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;
       }
       
         PreceedMatch = true;
       }
       


@@ -155,7 +163,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;
         


@@ -176,7 +184,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    if ((A->Flags & HasArg) == HasArg)
    {
       if (Argument == 0)
    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;
       


@@ -190,13 +198,13 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         const char *J;
         for (J = Argument; *J != 0 && *J != '='; J++);
         if (*J == 0)
         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


@@ -205,7 +213,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;
    }
    


@@ -220,10 +234,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);


@@ -251,7 +265,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
            break;
         
         if (strlen(argv[I]) >= sizeof(Buffer))
            break;
         
         if (strlen(argv[I]) >= sizeof(Buffer))

-           return _error->Error("Option '%s' is too long",argv[I]);
+           return _error->Error(_("Option '%s' is too long"),argv[I]);

 
         // Skip the leading dash
         const char *J = argv[I];
 
         // Skip the leading dash
         const char *J = argv[I];


@@ -284,7 +298,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;
    }


@@ -334,7 +348,7 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
    if (Map[I].Match == 0)
    {
       if (NoMatch == true)
    if (Map[I].Match == 0)
    {
       if (NoMatch == true)

-        _error->Error("Invalid operation %s",FileList[0]);
+        _error->Error(_("Invalid operation %s"),FileList[0]);

    }
    
    return false;
    }
    
    return false;