Merge remote-tracking branch 'mvo/bugfix/lp1274466-cache' into debian/sid

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

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 7c0c71aa7b83abef8b962fc4e679fe720c64da81..143df58b23d1ebdc331631c3f9eb8913e213edb9 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,9 +44,13 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
+#include <apt-pkg/macros.h>
 
-
+#ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
+#endif
+
+class Configuration;
 
 class CommandLine
 {
@@ -78,9 +82,15 @@ class CommandLine
    
    bool Parse(int argc,const char **argv);
    void ShowHelp();
-   unsigned int FileSize() const;
+   unsigned int FileSize() const APT_PURE;
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
       
+   static char const * GetCommand(Dispatch const * const Map,
+        unsigned int const argc, char const * const * const argv) APT_PURE;
+
+   static CommandLine::Args MakeArgs(char ShortOpt, char const *LongOpt,
+        char const *ConfName, unsigned long Flags) APT_CONST;
+
    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
 };