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 6b36325c7c71949e0905abedb45aa85db031feb4..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.1 1998/09/22 05:30:26 jgg Exp $
+// $Id: cmndline.cc,v 1.4 1998/10/20 02:39:25 jgg Exp $
 /* ######################################################################
 
    Command Line Class - Sophisticated command line parser
@@ -22,6 +22,14 @@
 CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList), 
                                  Conf(Conf), FileList(0)
 {
+}
+                                                                       /*}}}*/
+// CommandLine::~CommandLine - Destructor                              /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+CommandLine::~CommandLine()
+{
+   delete [] FileList;
 }
                                                                        /*}}}*/
 // CommandLine::Parse - Main action member                             /*{{{*/
@@ -29,6 +37,7 @@ CommandLine::CommandLine(Args *AList,Configuration *Conf) : ArgList(AList),
 /* */
 bool CommandLine::Parse(int argc,const char **argv)
 {
+   delete [] FileList;
    FileList = new const char *[argc];
    const char **Files = FileList;
    int I;
@@ -99,6 +108,10 @@ bool CommandLine::Parse(int argc,const char **argv)
         
         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]);
       }
       
       // Deal with it.
@@ -164,6 +177,27 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       // Parse a configuration file
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
+
+      // Arbitary item specification
+      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]);
+
+        // = 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;
+      }
       
       Conf->Set(A->ConfName,Argument);
       return true;
@@ -225,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)
         {
@@ -242,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);
       
@@ -278,3 +291,14 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
    return true;
 }
                                                                        /*}}}*/
+// CommandLine::FileSize - Count the number of filenames                                                                       /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned int CommandLine::FileSize() const
+{
+   unsigned int Count = 0;
+   for (const char **I = FileList; I != 0 && *I != 0; I++)
+      Count++;
+   return Count;
+}
+                                                                       /*}}}*/