warn if apt-key is run unconditionally in maintainerscript

[apt.git] / apt-private / private-cmndline.h

diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h
index 7b468456b857123bb8e91f0d49f43526fca656c3..6235ef9f5870a356a17a11bceb1d1c7d405aba8e 100644 (file)
--- a/apt-private/private-cmndline.h
+++ b/apt-private/private-cmndline.h
@@ -9,9 +9,31 @@
 class Configuration;
 class pkgSystem;
 
 class Configuration;
 class pkgSystem;
 

-APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(char const * const Program, char const * const Cmd);
-APT_PUBLIC void ParseCommandLine(CommandLine &CmdL, CommandLine::Dispatch * const Cmds, CommandLine::Args * const Args,
+enum class APT_CMD {
+   APT,
+   APT_GET,
+   APT_CACHE,
+   APT_CDROM,
+   APT_CONFIG,
+   APT_EXTRACTTEMPLATES,
+   APT_FTPARCHIVE,
+   APT_HELPER,
+   APT_INTERNAL_SOLVER,
+   APT_MARK,
+   APT_SORTPKG,
+};
+struct aptDispatchWithHelp
+{
+   const char *Match;
+   bool (*Handler)(CommandLine &);
+   const char *Help;
+};
+
+APT_PUBLIC std::vector<CommandLine::Dispatch> ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,

       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],
       Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[],

-      bool(*ShowHelp)(CommandLine &CmdL));
+      bool (*ShowHelp)(CommandLine &), std::vector<aptDispatchWithHelp> (*GetCommands)(void));
+APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector<CommandLine::Dispatch> const &Cmds);
+
+APT_PUBLIC std::vector<CommandLine::Args> getCommandArgs(APT_CMD const Program, char const * const Cmd);

 
 #endif
 
 #endif