Start on acquire stuff

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 8e25d395ffca517db5a39f3d8101e8127b45df6e..94ca4dc70f8e041e545c1c429d12f4c223774c10 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.2 1998/09/26 05:34:24 jgg Exp $
+// $Id: cmndline.cc,v 1.4 1998/10/20 02:39:25 jgg Exp $
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
@@ -184,9 +184,17 @@ 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 =.",argv[I]);
+           return _error->Error("Option %s: Configuration item sepecification must have an =<val>.",argv[I]);
 
-        Conf->Set(string(Argument,J-Argument),string(J+1));
+        // = is trailing
+        if (J[1] == 0)
+        {
+           if (I+1 >= argc)
+              return _error->Error("Option %s: Configuration item sepecification must have an =<val>.",argv[I]);
+           Conf->Set(string(Argument,J-Argument),string(argv[I++ +1]));
+        }
+        else
+           Conf->Set(string(Argument,J-Argument),string(J+1));
         
         return true;
       }
@@ -251,14 +259,10 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
            break;
       }
 
-      // Check for positives
-      if (strcasecmp(Argument,"yes") == 0 ||
-         strcasecmp(Argument,"true") == 0 ||
-         strcasecmp(Argument,"with") == 0 ||
-         strcasecmp(Argument,"enable") == 0)
+      // Check for boolean
+      Sense = StringToBool(Argument);
+      if (Sense >= 0)
       {
-        Sense = 1;
-
         // Eat the argument     
         if (Argument != Buffer)
         {
@@ -268,23 +272,6 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         break;
       }
 
-      // Check for negatives
-      if (strcasecmp(Argument,"no") == 0 ||
-         strcasecmp(Argument,"false") == 0 ||
-         strcasecmp(Argument,"without") == 0 ||
-         strcasecmp(Argument,"disable") == 0)
-      {
-        Sense = 0;
-        
-        // Eat the argument     
-        if (Argument != Buffer)
-        {
-           Opt += strlen(Opt);
-           I += IncI;
-        }       
-        break;
-      }
-      
       if (CertainArg == true)
         return _error->Error("Sense %s is not understood, try true or false.",Argument);