From 011188e3920f21e6883c2dab956b3d4fb4e8cbfa Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 25 Oct 2015 23:45:09 +0100 Subject: generate commands array after config is loaded This ensures that location strings loaded from a location specified via configuration (Dir::Locale) effect the help messages for commands. Git-Dch: Ignore --- apt-private/private-cmndline.h | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'apt-private/private-cmndline.h') diff --git a/apt-private/private-cmndline.h b/apt-private/private-cmndline.h index 5674088bc..aee679bf8 100644 --- a/apt-private/private-cmndline.h +++ b/apt-private/private-cmndline.h @@ -9,10 +9,27 @@ class Configuration; class pkgSystem; -APT_PUBLIC std::vector getCommandArgs(char const * const Program, char const * const Cmd); -APT_PUBLIC void ParseCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * Cmds, char const * const Binary, - Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[], - bool(*ShowHelp)(CommandLine &, CommandLine::DispatchWithHelp const *)); -APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * const Cmds); +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, +}; + +bool ShowHelp(CommandLine &CmdL, CommandLine::DispatchWithHelp const * Cmds); +std::vector GetCommands(); + +APT_PUBLIC std::vector ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary, + Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char * argv[]); +APT_PUBLIC unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector const &Cmds); + +APT_PUBLIC std::vector getCommandArgs(APT_CMD const Program, char const * const Cmd); #endif -- cgit v1.2.3