* fix missing SetExecClose() call when the status-fd is used

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 858a5300ab4af9d6717f1048cb694f0596da934a..54c91d67d919986cb0ca4514f0f9b58626fa1b93 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,20 +1,23 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cmndline.cc,v 1.6 1998/11/25 23:54:22 jgg Exp $
+// $Id: cmndline.cc,v 1.15 2003/02/10 01:40:58 doogie Exp $
 /* ######################################################################
 
    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                                                       /*{{{*/
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cmndline.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                              /*{{{*/
 // ---------------------------------------------------------------------
@@ -56,7 +59,10 @@ bool CommandLine::Parse(int argc,const char **argv)
       
       // Double dash signifies the end of option processing
       if (*Opt == '-' && Opt[1] == 0)
+      {
+        I++;
         break;
+      }
       
       // Single dash is a short option
       if (*Opt != '-')
@@ -68,7 +74,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 known."),*Opt,argv[I]);
 
            if (HandleOpt(I,argc,argv,Opt,A) == false)
               return false;
@@ -94,16 +100,15 @@ bool CommandLine::Parse(int argc,const char **argv)
         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++;
-        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)
-           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)
@@ -111,12 +116,12 @@ 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"),argv[I]);
         }
         
         // 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;
       }
       
@@ -155,7 +160,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)
-        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;
         
@@ -176,7 +181,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    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;
       
@@ -190,13 +195,13 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         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)
-              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
@@ -205,7 +210,13 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         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;
    }
    
@@ -220,10 +231,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)
-           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
-        if (EndPtr != Argument)
+        if (EndPtr != 0 && EndPtr != Argument && *EndPtr == 0)
         {
            Conf->Set(A->ConfName,Value);
            Opt += strlen(Opt);
@@ -251,7 +262,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
            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];
@@ -284,7 +295,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       }
 
       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;
    }
@@ -316,7 +327,7 @@ unsigned int CommandLine::FileSize() const
 // CommandLine::DispatchArg - Do something with the first arg          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool CommandLine::DispatchArg(Dispatch *Map)
+bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
 {
    int I;
    for (I = 0; Map[I].Match != 0; I++)
@@ -332,7 +343,11 @@ bool CommandLine::DispatchArg(Dispatch *Map)
    
    // No matching name
    if (Map[I].Match == 0)
-      _error->Error("Invalid operation %s",FileList[0]);
+   {
+      if (NoMatch == true)
+        _error->Error(_("Invalid operation %s"),FileList[0]);
+   }
+   
    return false;
 }
                                                                        /*}}}*/