* buildlib/inttypes.h.in:

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

diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc
index 807383560d399e62e19514b2dfa706f1bf30742f..159f330a182488d35cf9a930f265e5def324a82e 100644 (file)
--- a/apt-pkg/contrib/cmndline.cc
+++ b/apt-pkg/contrib/cmndline.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: cmndline.cc,v 1.13 2002/09/14 05:29:22 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


@@ -11,15 +11,16 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/cmndline.h"
-#endif
+#include<config.h>
+
+#include <apt-pkg/configuration.h>

 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/cmndline.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 

-#include <apti18n.h>    
+#include <apti18n.h>

                                                                        /*}}}*/
                                                                        /*}}}*/

+using namespace std;

 
 // CommandLine::CommandLine - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------
 
 // CommandLine::CommandLine - Constructor                              /*{{{*/
 // ---------------------------------------------------------------------


@@ -89,9 +90,8 @@ bool CommandLine::Parse(int argc,const char **argv)
       Opt++;
 
       // Match up to a = against the list
       Opt++;
 
       // Match up to a = against the list

-      const char *OptEnd = Opt;

       Args *A;
       Args *A;

-      for (; *OptEnd != 0 && *OptEnd != '='; OptEnd++);
+      const char *OptEnd = strchrnul(Opt, '=');

       for (A = ArgList; A->end() == false && 
           stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
       
       for (A = ArgList; A->end() == false && 
           stringcasecmp(Opt,OptEnd,A->LongOpt) != 0; A++);
       


@@ -99,9 +99,8 @@ bool CommandLine::Parse(int argc,const char **argv)
       bool PreceedMatch = false;
       if (A->end() == true)
       {
       bool PreceedMatch = false;
       if (A->end() == true)
       {

-        for (; Opt != OptEnd && *Opt != '-'; Opt++);
-
-        if (Opt == OptEnd)
+         Opt = (const char*) memchr(Opt, '-', OptEnd - Opt);
+        if (Opt == NULL)

            return _error->Error(_("Command line option %s is not understood"),argv[I]);
         Opt++;
         
            return _error->Error(_("Command line option %s is not understood"),argv[I]);
         Opt++;
         


@@ -137,7 +136,9 @@ bool CommandLine::Parse(int argc,const char **argv)
    for (; I != argc; I++)
       *Files++ = argv[I];
    *Files = 0;
    for (; I != argc; I++)
       *Files++ = argv[I];
    *Files = 0;

-   
+
+   SaveInConfig(argc, argv);
+

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -191,19 +192,18 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 
       if ((A->Flags & ConfigFile) == ConfigFile)
         return ReadConfigFile(*Conf,Argument);
 

-      // Arbitary item specification
+      // Arbitrary item specification

       if ((A->Flags & ArbItem) == ArbItem)
       {
       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]);
+        const char *J = strchr(Argument, '=');
+        if (J == NULL)
+           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


@@ -212,8 +212,7 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         return true;
       }
       
         return true;
       }
       

-      const char *I = A->ConfName;
-      for (; *I != 0 && *I != ' '; I++);
+      const char *I = strchrnul(A->ConfName, ' ');

       if (*I == ' ')
         Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
       else
       if (*I == ' ')
         Conf->Set(string(A->ConfName,0,I-A->ConfName),string(I+1) + Argument);
       else


@@ -269,10 +268,9 @@ bool CommandLine::HandleOpt(int &I,int argc,const char *argv[],
         // Skip the leading dash
         const char *J = argv[I];
         for (; *J != 0 && *J == '-'; J++);
         // 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)
+
+        const char *JEnd = strchr(J, '-');
+        if (JEnd != NULL)

         {
            strncpy(Buffer,J,JEnd - J);
            Buffer[JEnd - J] = 0;
         {
            strncpy(Buffer,J,JEnd - J);
            Buffer[JEnd - J] = 0;


@@ -353,3 +351,40 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch)
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+// CommandLine::SaveInConfig - for output later in a logfile or so     /*{{{*/
+// ---------------------------------------------------------------------
+/* We save the commandline here to have it around later for e.g. logging.
+   It feels a bit like a hack here and isn't bulletproof, but it is better
+   than nothing after all. */
+void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv)
+{
+   char cmdline[100 + argc * 50];
+   unsigned int length = 0;
+   bool lastWasOption = false;
+   bool closeQuote = false;
+   for (unsigned int i = 0; i < argc && length < sizeof(cmdline); ++i, ++length)
+   {
+      for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length)
+      {
+        cmdline[length] = argv[i][j];
+        if (lastWasOption == true && argv[i][j] == '=')
+        {
+           // That is possibly an option: Quote it if it includes spaces,
+           // the benefit is that this will eliminate also most false positives
+           const char* c = strchr(&argv[i][j+1], ' ');
+           if (c == NULL) continue;
+           cmdline[++length] = '"';
+           closeQuote = true;
+        }
+      }
+      if (closeQuote == true)
+        cmdline[length++] = '"';
+      // Problem: detects also --hello
+      if (cmdline[length-1] == 'o')
+        lastWasOption = true;
+      cmdline[length] = ' ';
+   }
+   cmdline[--length] = '\0';
+   _config->Set("CommandLine::AsString", cmdline);
+}
+                                                                       /*}}}*/