X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/e7e10e47476606e3b2274cf66b1e8ea74b236757..30896d0137b02fc0559642a87cd524f2b6504b3c:/apt-private/private-cmndline.cc diff --git a/apt-private/private-cmndline.cc b/apt-private/private-cmndline.cc index a0acbbd79..829085916 100644 --- a/apt-private/private-cmndline.cc +++ b/apt-private/private-cmndline.cc @@ -7,14 +7,17 @@ #include #include #include +#include #include -#include #include #include #include +#include +#include + #include /*}}}*/ @@ -153,6 +156,15 @@ static bool addArgumentsAPTInternalSolver(std::vector &, char return true; } /*}}}*/ +static bool addArgumentsAPTHelper(std::vector &Args, char const * const Cmd)/*{{{*/ +{ + if (CmdMatches("cat-file")) + { + addArg('C', "compress", "Apt-Helper::Cat-File::Compress",CommandLine::HasArg); + } + return true; +} + /*}}}*/ static bool addArgumentsAPTGet(std::vector &Args, char const * const Cmd)/*{{{*/ { if (CmdMatches("install", "remove", "purge", "upgrade", "dist-upgrade", @@ -315,34 +327,32 @@ static bool addArgumentsAPT(std::vector &Args, char const * c return true; } /*}}}*/ -std::vector getCommandArgs(char const * const Program, char const * const Cmd)/*{{{*/ +std::vector getCommandArgs(APT_CMD const Program, char const * const Cmd)/*{{{*/ { std::vector Args; Args.reserve(50); - if (Program == NULL || Cmd == NULL) - ; // FIXME: Invalid command supplied + if (Cmd == nullptr) + { + if (Program == APT_CMD::APT_EXTRACTTEMPLATES) + addArgumentsAPTExtractTemplates(Args, Cmd); + } else if (strcmp(Cmd, "help") == 0) ; // no options for help so no need to implement it in each - else if (strcmp(Program, "apt-get") == 0) - addArgumentsAPTGet(Args, Cmd); - else if (strcmp(Program, "apt-cache") == 0) - addArgumentsAPTCache(Args, Cmd); - else if (strcmp(Program, "apt-cdrom") == 0) - addArgumentsAPTCDROM(Args, Cmd); - else if (strcmp(Program, "apt-config") == 0) - addArgumentsAPTConfig(Args, Cmd); - else if (strcmp(Program, "apt-extracttemplates") == 0) - addArgumentsAPTExtractTemplates(Args, Cmd); - else if (strcmp(Program, "apt-ftparchive") == 0) - addArgumentsAPTFTPArchive(Args, Cmd); - else if (strcmp(Program, "apt-internal-solver") == 0) - addArgumentsAPTInternalSolver(Args, Cmd); - else if (strcmp(Program, "apt-mark") == 0) - addArgumentsAPTMark(Args, Cmd); - else if (strcmp(Program, "apt-sortpkg") == 0) - addArgumentsAPTSortPkgs(Args, Cmd); - else if (strcmp(Program, "apt") == 0) - addArgumentsAPT(Args, Cmd); + else + switch (Program) + { + case APT_CMD::APT: addArgumentsAPT(Args, Cmd); break; + case APT_CMD::APT_GET: addArgumentsAPTGet(Args, Cmd); break; + case APT_CMD::APT_CACHE: addArgumentsAPTCache(Args, Cmd); break; + case APT_CMD::APT_CDROM: addArgumentsAPTCDROM(Args, Cmd); break; + case APT_CMD::APT_CONFIG: addArgumentsAPTConfig(Args, Cmd); break; + case APT_CMD::APT_EXTRACTTEMPLATES: addArgumentsAPTExtractTemplates(Args, Cmd); break; + case APT_CMD::APT_FTPARCHIVE: addArgumentsAPTFTPArchive(Args, Cmd); break; + case APT_CMD::APT_HELPER: addArgumentsAPTHelper(Args, Cmd); break; + case APT_CMD::APT_INTERNAL_SOLVER: addArgumentsAPTInternalSolver(Args, Cmd); break; + case APT_CMD::APT_MARK: addArgumentsAPTMark(Args, Cmd); break; + case APT_CMD::APT_SORTPKG: addArgumentsAPTSortPkgs(Args, Cmd); break; + } // options without a command addArg('h', "help", "help", 0); @@ -359,6 +369,60 @@ std::vector getCommandArgs(char const * const Program, char c /*}}}*/ #undef CmdMatches #undef addArg +static void ShowHelpListCommands(std::vector const &Cmds)/*{{{*/ +{ + if (Cmds.empty() || Cmds[0].Match == nullptr) + return; + std::cout << std::endl << _("Most used commands:") << std::endl; + for (auto const &c: Cmds) + { + if (c.Help == nullptr) + continue; + std::cout << " " << c.Match << " - " << c.Help << std::endl; + } +} + /*}}}*/ +static bool ShowCommonHelp(APT_CMD const Binary, CommandLine &CmdL, std::vector const &Cmds,/*{{{*/ + bool (*ShowHelp)(CommandLine &)) +{ + std::cout << PACKAGE << " " << PACKAGE_VERSION << " (" << COMMON_ARCH << ")" << std::endl; + if (_config->FindB("version") == true && Binary != APT_CMD::APT_GET) + return true; + if (ShowHelp(CmdL) == false) + return false; + if (_config->FindB("version") == true || Binary == APT_CMD::APT_FTPARCHIVE) + return true; + ShowHelpListCommands(Cmds); + std::cout << std::endl; + char const * cmd = nullptr; + switch (Binary) + { + case APT_CMD::APT: cmd = "apt(8)"; break; + case APT_CMD::APT_CACHE: cmd = "apt-cache(8)"; break; + case APT_CMD::APT_CDROM: cmd = "apt-cdrom(8)"; break; + case APT_CMD::APT_CONFIG: cmd = "apt-config(8)"; break; + case APT_CMD::APT_EXTRACTTEMPLATES: cmd = "apt-extracttemplates(1)"; break; + case APT_CMD::APT_FTPARCHIVE: cmd = "apt-ftparchive(1)"; break; + case APT_CMD::APT_GET: cmd = "apt-get(8)"; break; + case APT_CMD::APT_HELPER: cmd = nullptr; break; + case APT_CMD::APT_INTERNAL_SOLVER: cmd = nullptr; break; + case APT_CMD::APT_MARK: cmd = "apt-mark(8)"; break; + case APT_CMD::APT_SORTPKG: cmd = "apt-sortpkgs(1)"; break; + } + if (cmd != nullptr) + ioprintf(std::cout, _("See %s for more information about the available commands."), cmd); + std::cout << std::endl << + _("Configuration options and syntax is detailed in apt.conf(5).\n" + "Information about how to configure sources can be found in sources.list(5).\n" + "Package and version choices can be expressed via apt_preferences(5).\n" + "Security details are available in apt-secure(8).\n"); + if (Binary == APT_CMD::APT_GET || Binary == APT_CMD::APT) + std::cout << std::right << std::setw(70) << _("This APT has Super Cow Powers.") << std::endl; + else if (Binary == APT_CMD::APT_HELPER) + std::cout << std::right << std::setw(70) << _("This APT helper has Super Meep Powers.") << std::endl; + return true; +} + /*}}}*/ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/ { std::string const binary = flNotDir(Binary); @@ -369,10 +433,13 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/ _config->CndSet("Binary::apt::APT::Cache::AllVersions", false); _config->CndSet("Binary::apt::APT::Cache::ShowVirtuals", true); _config->CndSet("Binary::apt::APT::Cache::Search::Version", 2); + _config->CndSet("Binary::apt::APT::Cache::ShowDependencyType", true); + _config->CndSet("Binary::apt::APT::Cache::ShowVersion", true); _config->CndSet("Binary::apt::APT::Get::Upgrade-Allow-New", true); _config->CndSet("Binary::apt::APT::Cmd::Show-Update-Stats", true); _config->CndSet("Binary::apt::DPkg::Progress-Fancy", true); _config->CndSet("Binary::apt::Acquire::AllowInsecureRepositories", false); + _config->CndSet("Binary::apt::APT::Keep-Downloaded-Packages", false); } _config->Set("Binary", binary); @@ -380,19 +447,10 @@ static void BinarySpecificConfiguration(char const * const Binary) /*{{{*/ _config->MoveSubTree(conf.c_str(), NULL); } /*}}}*/ -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 *)) +std::vector ParseCommandLine(CommandLine &CmdL, APT_CMD const Binary,/*{{{*/ + Configuration * const * const Cnf, pkgSystem ** const Sys, int const argc, const char *argv[], + bool (*ShowHelp)(CommandLine &), std::vector (*GetCommands)(void)) { - // Args running out of scope invalidates the pointer stored in CmdL, - // but we don't use the pointer after this function, so we ignore - // this problem for now and figure something out if we have to. - std::vector Args; - if (Cmds != nullptr && Cmds[0].Handler != nullptr) - Args = getCommandArgs(Binary, CommandLine::GetCommand(Cmds, argc, argv)); - else - Args = getCommandArgs(Binary, Binary); - CmdL = CommandLine(Args.data(), _config); - if (Cnf != NULL && pkgInitConfig(**Cnf) == false) { _error->DumpErrors(); @@ -402,11 +460,31 @@ void ParseCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * C if (likely(argc != 0 && argv[0] != NULL)) BinarySpecificConfiguration(argv[0]); + std::vector const CmdsWithHelp = GetCommands(); + std::vector Cmds; + if (CmdsWithHelp.empty() == false) + { + CommandLine::Dispatch const help = { "help", [](CommandLine &){return false;} }; + Cmds.push_back(std::move(help)); + } + for (auto const& cmd : CmdsWithHelp) + Cmds.push_back({cmd.Match, cmd.Handler}); + + // Args running out of scope invalidates the pointer stored in CmdL, + // but we don't use the pointer after this function, so we ignore + // this problem for now and figure something out if we have to. + std::vector Args; + if (Cmds.empty() == false && Cmds[0].Handler != nullptr) + Args = getCommandArgs(Binary, CommandLine::GetCommand(Cmds.data(), argc, argv)); + else + Args = getCommandArgs(Binary, nullptr); + CmdL = CommandLine(Args.data(), _config); + if (CmdL.Parse(argc,argv) == false || (Sys != NULL && pkgInitSystem(*_config, *Sys) == false)) { if (_config->FindB("version") == true) - ShowHelp(CmdL, Cmds); + ShowCommonHelp(Binary, CmdL, CmdsWithHelp, ShowHelp); _error->DumpErrors(); exit(100); @@ -416,20 +494,21 @@ void ParseCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * C if (_config->FindB("help") == true || _config->FindB("version") == true || (CmdL.FileSize() > 0 && strcmp(CmdL.FileList[0], "help") == 0)) { - ShowHelp(CmdL, Cmds); + ShowCommonHelp(Binary, CmdL, CmdsWithHelp, ShowHelp); exit(0); } - if (Cmds != nullptr && CmdL.FileSize() == 0) + if (Cmds.empty() == false && CmdL.FileSize() == 0) { - ShowHelp(CmdL, Cmds); + ShowCommonHelp(Binary, CmdL, CmdsWithHelp, ShowHelp); exit(1); } + return Cmds; } /*}}}*/ -unsigned short DispatchCommandLine(CommandLine &CmdL, CommandLine::DispatchWithHelp const * const Cmds) /*{{{*/ +unsigned short DispatchCommandLine(CommandLine &CmdL, std::vector const &Cmds) /*{{{*/ { // Match the operation - bool const returned = (Cmds != nullptr) ? CmdL.DispatchArg(Cmds) : true; + bool const returned = Cmds.empty() ? true : CmdL.DispatchArg(Cmds.data()); // Print any errors or warnings found during parsing bool const Errors = _error->PendingError();