avoid triggering gcc's -Wunsafe-loop-optimizations in EDSP

[apt.git] / cmdline / apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index f6eaa11f7023a92f0ce6d6453f7a8ff0bed8ae18..2df1d3bef32efa9632490fec979a96999b42600f 100644 (file)
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -41,21 +41,14 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
-// ShowHelp - Show a help screen                                       /*{{{*/
-bool ShowHelp(CommandLine &, CommandLine::DispatchWithHelp const *) {
-       ioprintf(std::cout, "%s %s (%s)\n", PACKAGE, PACKAGE_VERSION, COMMON_ARCH);
-
+static bool ShowHelp(CommandLine &)                                    /*{{{*/
+{
        std::cout <<
                _("Usage: apt-internal-solver\n"
                "\n"
                "apt-internal-solver is an interface to use the current internal\n"
-               "like an external resolver for the APT family for debugging or alike\n"
-               "\n"
-               "Options:\n"
-               "  -h  This help text.\n"
-               "  -q  Loggable output - no progress indicator\n"
-               "  -c=? Read this configuration file\n"
-               "  -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n");
+               "resolver for the APT family like an external one, for debugging or\n"
+               "the like.\n");
        return true;
 }
                                                                        /*}}}*/
@@ -65,7 +58,7 @@ APT_NORETURN static void DIE(std::string const &message) {            /*{{{*/
        exit(EXIT_FAILURE);
 }
                                                                        /*}}}*/
-std::vector<CommandLine::DispatchWithHelp> GetCommands()               /*{{{*/
+static std::vector<aptDispatchWithHelp> GetCommands()                  /*{{{*/
 {
    return {};
 }
@@ -78,7 +71,7 @@ int main(int argc,const char *argv[])                                 /*{{{*/
        DropPrivileges();
 
        CommandLine CmdL;
-       ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv);
+       ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands);
 
        if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
        {
@@ -89,12 +82,14 @@ int main(int argc,const char *argv[])                                       /*{{{*/
                pkgCacheFile CacheFile;
                CacheFile.Open(NULL, false);
                APT::PackageSet pkgset = APT::PackageSet::FromCommandLine(CacheFile, CmdL.FileList + 1);
-               FILE* output = stdout;
+               FileFd output;
+               if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
+                       return 2;
                if (pkgset.empty() == true)
                        EDSP::WriteScenario(CacheFile, output);
                else
                        EDSP::WriteLimitedScenario(CacheFile, output, pkgset);
-               fclose(output);
+               output.Close();
                _error->DumpErrors(std::cerr);
                return 0;
        }
@@ -109,8 +104,10 @@ int main(int argc,const char *argv[])                                      /*{{{*/
        _config->Set("APT::System", "Debian APT solver interface");
        _config->Set("APT::Solver", "internal");
        _config->Set("edsp::scenario", "/nonexistent/stdin");
-       int input = STDIN_FILENO;
-       FILE* output = stdout;
+       FileFd output;
+       if (output.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::BufferedWrite, true) == false)
+          DIE("stdout couldn't be opened");
+       int const input = STDIN_FILENO;
        SetNonBlock(input, false);
 
        EDSP::WriteProgress(0, "Start up solver…", output);