Merge branch 'portability/freebsd'

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

diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h
index 9f505fd410547edc8fc2678872a2caa4dfe08e64..805cb9eae83bc5310bd56e226b6b7b137eff9338 100644 (file)
--- a/apt-pkg/contrib/cmndline.h
+++ b/apt-pkg/contrib/cmndline.h
@@ -44,6 +44,8 @@
 #ifndef PKGLIB_CMNDLINE_H
 #define PKGLIB_CMNDLINE_H
 
+#include <apt-pkg/macros.h>
+
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/configuration.h>
 #endif
@@ -55,6 +57,7 @@ class CommandLine
    public:
    struct Args;
    struct Dispatch;
+   struct DispatchWithHelp;
    
    protected:
    
@@ -80,9 +83,18 @@ class CommandLine
    
    bool Parse(int argc,const char **argv);
    void ShowHelp();
-   unsigned int FileSize() const;
+   unsigned int FileSize() const APT_PURE;
+   // FIXME: merge on next ABI break
    bool DispatchArg(Dispatch *List,bool NoMatch = true);
+   bool DispatchArg(Dispatch const * const 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();
    CommandLine(Args *AList,Configuration *Conf);
    ~CommandLine();
 };