X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/c0a5e4644c8cf77feb035cfe8961f40099e1e3c6..a6f8c07f83e4e5a8155c04feab543dc0c82ed495:/cmdline/apt-internal-solver.cc

diff --git a/cmdline/apt-internal-solver.cc b/cmdline/apt-internal-solver.cc
index e4cdf6381..2df1d3bef 100644
--- a/cmdline/apt-internal-solver.cc
+++ b/cmdline/apt-internal-solver.cc
@@ -25,8 +25,13 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/cacheiterators.h>
 
+#include <apt-private/private-output.h>
+#include <apt-private/private-cmndline.h>
+#include <apt-private/private-main.h>
+
 #include <string.h>
 #include <iostream>
+#include <sstream>
 #include <list>
 #include <string>
 #include <unistd.h>
@@ -36,24 +41,14 @@
 #include <apti18n.h>
 									/*}}}*/
 
-// ShowHelp - Show a help screen					/*{{{*/
-// ---------------------------------------------------------------------
-/* */
-static bool ShowHelp(CommandLine &) {
-	ioprintf(std::cout,_("%s %s for %s compiled on %s %s\n"),PACKAGE,PACKAGE_VERSION,
-		 COMMON_ARCH,__DATE__,__TIME__);
-
+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;
 }
 									/*}}}*/
@@ -63,30 +58,20 @@ APT_NORETURN static void DIE(std::string const &message) {		/*{{{*/
 	exit(EXIT_FAILURE);
 }
 									/*}}}*/
+static std::vector<aptDispatchWithHelp> GetCommands()			/*{{{*/
+{
+   return {};
+}
+									/*}}}*/
 int main(int argc,const char *argv[])					/*{{{*/
 {
-	CommandLine::Args Args[] = {
-		{'h',"help","help",0},
-		{'v',"version","version",0},
-		{'q',"quiet","quiet",CommandLine::IntLevel},
-		{'q',"silent","quiet",CommandLine::IntLevel},
-		{'c',"config-file",0,CommandLine::ConfigFile},
-		{'o',"option",0,CommandLine::ArbItem},
-		{0,0,0,0}};
-
-	CommandLine CmdL(Args,_config);
-	if (pkgInitConfig(*_config) == false ||
-	    CmdL.Parse(argc,argv) == false) {
-		_error->DumpErrors();
-		return 2;
-	}
+	InitLocale();
 
-	// See if the help should be shown
-	if (_config->FindB("help") == true ||
-	    _config->FindB("version") == true) {
-		ShowHelp(CmdL);
-		return 1;
-	}
+	// we really don't need anything
+	DropPrivileges();
+
+	CommandLine CmdL;
+	ParseCommandLine(CmdL, APT_CMD::APT_INTERNAL_SOLVER, &_config, NULL, argc, argv, &ShowHelp, &GetCommands);
 
 	if (CmdL.FileList[0] != 0 && strcmp(CmdL.FileList[0], "scenario") == 0)
 	{
@@ -97,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;
 	}
@@ -114,10 +101,13 @@ int main(int argc,const char *argv[])					/*{{{*/
 	if (_config->FindI("quiet", 0) < 1)
 		_config->Set("Debug::EDSP::WriteSolution", true);
 
+	_config->Set("APT::System", "Debian APT solver interface");
 	_config->Set("APT::Solver", "internal");
-	_config->Set("edsp::scenario", "stdin");
-	int input = STDIN_FILENO;
-	FILE* output = stdout;
+	_config->Set("edsp::scenario", "/nonexistent/stdin");
+	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);
@@ -168,18 +158,20 @@ int main(int argc,const char *argv[])					/*{{{*/
 
 	EDSP::WriteProgress(60, "Call problemresolver on current scenario…", output);
 
+	std::string failure;
 	if (upgrade == true) {
-		if (pkgAllUpgrade(CacheFile) == false) {
-			EDSP::WriteError("ERR_UNSOLVABLE_UPGRADE", "An upgrade error occurred", output);
-			return 0;
-		}
+		if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::FORBID_REMOVE_PACKAGES | APT::Upgrade::FORBID_INSTALL_NEW_PACKAGES) == false)
+			failure = "ERR_UNSOLVABLE_UPGRADE";
 	} else if (distUpgrade == true) {
-		if (pkgDistUpgrade(CacheFile) == false) {
-			EDSP::WriteError("ERR_UNSOLVABLE_DIST_UPGRADE", "An dist-upgrade error occurred", output);
-			return 0;
-		}
-	} else if (Fix.Resolve() == false) {
-		EDSP::WriteError("ERR_UNSOLVABLE", "An error occurred", output);
+		if (APT::Upgrade::Upgrade(CacheFile, APT::Upgrade::ALLOW_EVERYTHING) == false)
+			failure = "ERR_UNSOLVABLE_DIST_UPGRADE";
+	} else if (Fix.Resolve() == false)
+		failure = "ERR_UNSOLVABLE";
+
+	if (failure.empty() == false) {
+		std::ostringstream broken;
+		ShowBroken(broken, CacheFile, false);
+		EDSP::WriteError(failure.c_str(), broken.str(), output);
 		return 0;
 	}
 
@@ -190,11 +182,6 @@ int main(int argc,const char *argv[])					/*{{{*/
 
 	EDSP::WriteProgress(100, "Done", output);
 
-	bool const Errors = _error->PendingError();
-	if (_config->FindI("quiet",0) > 0)
-		_error->DumpErrors(std::cerr);
-	else
-		_error->DumpErrors(std::cerr, GlobalError::DEBUG);
-	return Errors == true ? 100 : 0;
+	return DispatchCommandLine(CmdL, {});
 }
 									/*}}}*/