Fixed espy's bug with experimental

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 94ca4dc70f8e041e545c1c429d12f4c223774c10..3c3717c99f939efae1c2afb2774c359b71baaa44 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: cmndline.cc,v 1.4 1998/10/20 02:39:25 jgg Exp $
+// $Id: cmndline.cc,v 1.9 1999/01/27 02:48:52 jgg Exp $
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
@@ -13,7 +13,7 @@
 #endif
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
-#include <strutl.h>
+#include <apt-pkg/strutl.h>
                                                                        /*}}}*/
 
 // CommandLine::CommandLine - Constructor                              /*{{{*/
@@ -88,6 +88,7 @@ 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)
+      bool PreceedMatch = false;
       if (A->end() == true)
       {
         for (; Opt != OptEnd && *Opt != '-'; Opt++);
@@ -102,21 +103,25 @@ 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]);
-        
+
         // 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)
-           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)
            return _error->Error("Command line option %s is not boolean",argv[I]);
+        PreceedMatch = true;
       }
       
       // Deal with it.
       OptEnd--;
-      if (HandleOpt(I,argc,argv,OptEnd,A) == false)
+      if (HandleOpt(I,argc,argv,OptEnd,A,PreceedMatch) == false)
         return false;
    }
    
@@ -134,7 +139,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[],
-                           const char *&Opt,Args *A)
+                           const char *&Opt,Args *A,bool PreceedMatch)
 {
    const char *Argument = 0;
    bool CertainArg = false;
@@ -165,7 +170,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       else
         Argument = Opt + 1;
    }
-
+   
    // Option is an argument set
    if ((A->Flags & HasArg) == HasArg)
    {
@@ -199,7 +204,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;
    }
    
@@ -241,11 +252,16 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       char Buffer[300];
       if (Argument == 0)
       {
+        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 *JEnd = J;
         for (; *JEnd != 0 && *JEnd != '-'; JEnd++);
         if (*JEnd != 0)
@@ -291,7 +307,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    return true;
 }
                                                                        /*}}}*/
-// CommandLine::FileSize - Count the number of filenames                                                                       /*{{{*/
+// CommandLine::FileSize - Count the number of filenames               /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 unsigned int CommandLine::FileSize() const
@@ -302,3 +318,30 @@ unsigned int CommandLine::FileSize() const
    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;
+}
+                                                                       /*}}}*/