X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=src%2Fopkg-cl.c;h=c4e4492b3a7e98518a2577756f7aeecc843ba688;hp=f1c8f61853fd86ca17be47f7ea03efe2cc3c56b9;hb=673d7213175c2cf209b25c8eb2632941cdbb8519;hpb=599cc259280ccde97b2a3b459c3f015db6390127

diff --git a/src/opkg-cl.c b/src/opkg-cl.c
index f1c8f61..c4e4492 100644
--- a/src/opkg-cl.c
+++ b/src/opkg-cl.c
@@ -28,10 +28,11 @@
 #include "opkg_cmd.h"
 #include "file_util.h"
 #include "opkg_message.h"
+#include "opkg_download.h"
 #include "../libbb/libbb.h"
 
 enum {
-	ARGS_OPT_FORCE_MAINTAINER = 129, 
+	ARGS_OPT_FORCE_MAINTAINER = 129,
 	ARGS_OPT_FORCE_DEPENDS,
 	ARGS_OPT_FORCE_OVERWRITE,
 	ARGS_OPT_FORCE_DOWNGRADE,
@@ -39,7 +40,12 @@ enum {
 	ARGS_OPT_FORCE_REMOVAL_OF_DEPENDENT_PACKAGES,
 	ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES,
 	ARGS_OPT_FORCE_SPACE,
+	ARGS_OPT_FORCE_POSTINSTALL,
+	ARGS_OPT_FORCE_REMOVE,
+	ARGS_OPT_ADD_ARCH,
+	ARGS_OPT_ADD_DEST,
 	ARGS_OPT_NOACTION,
+	ARGS_OPT_DOWNLOAD_ONLY,
 	ARGS_OPT_NODEPS,
 	ARGS_OPT_AUTOREMOVE,
 	ARGS_OPT_CACHE,
@@ -73,10 +79,17 @@ static struct option long_options[] = {
 		ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
 	{"force_removal_of_essential_packages", 0, 0,
 		ARGS_OPT_FORCE_REMOVAL_OF_ESSENTIAL_PACKAGES},
+	{"force-postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+	{"force_postinstall", 0, 0, ARGS_OPT_FORCE_POSTINSTALL},
+	{"force-remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
+	{"force_remove", 0, 0, ARGS_OPT_FORCE_REMOVE},
 	{"noaction", 0, 0, ARGS_OPT_NOACTION},
+	{"download-only", 0, 0, ARGS_OPT_DOWNLOAD_ONLY},
 	{"nodeps", 0, 0, ARGS_OPT_NODEPS},
 	{"offline", 1, 0, 'o'},
 	{"offline-root", 1, 0, 'o'},
+	{"add-arch", 1, 0, ARGS_OPT_ADD_ARCH},
+	{"add-dest", 1, 0, ARGS_OPT_ADD_DEST},
 	{"test", 0, 0, ARGS_OPT_NOACTION},
 	{"tmp-dir", 1, 0, 't'},
 	{"tmp_dir", 1, 0, 't'},
@@ -91,9 +104,10 @@ args_parse(int argc, char *argv[])
 	int c;
 	int option_index = 0;
 	int parse_err = 0;
+	char *tuple, *targ;
 
 	while (1) {
-		c = getopt_long_only(argc, argv, "Ad:f:no:p:t:vV:",
+		c = getopt_long_only(argc, argv, "Ad:f:no:p:t:vV::",
 				long_options, &option_index);
 		if (c == -1)
 			break;
@@ -118,7 +132,9 @@ args_parse(int argc, char *argv[])
 			printf("opkg version %s\n", VERSION);
 			exit(0);
 		case 'V':
-			conf->verbosity = atoi(optarg);
+			conf->verbosity = INFO;
+			if (optarg != NULL)
+				conf->verbosity = atoi(optarg);
 			break;
 		case ARGS_OPT_AUTOREMOVE:
 			conf->autoremove = 1;
@@ -151,12 +167,35 @@ args_parse(int argc, char *argv[])
 		case ARGS_OPT_FORCE_SPACE:
 			conf->force_space = 1;
 			break;
+		case ARGS_OPT_FORCE_POSTINSTALL:
+			conf->force_postinstall = 1;
+			break;
+		case ARGS_OPT_FORCE_REMOVE:
+			conf->force_remove = 1;
+			break;
 		case ARGS_OPT_NODEPS:
 			conf->nodeps = 1;
 			break;
+		case ARGS_OPT_ADD_ARCH:
+		case ARGS_OPT_ADD_DEST:
+			tuple = xstrdup(optarg);
+			if ((targ = strchr(tuple, ':')) != NULL) {
+				*targ++ = 0;
+				if ((strlen(tuple) > 0) && (strlen(targ) > 0)) {
+					nv_pair_list_append(
+						(c == ARGS_OPT_ADD_ARCH)
+							? &conf->arch_list : &conf->tmp_dest_list,
+						tuple, targ);
+				}
+			}
+			free(tuple);
+			break;
 		case ARGS_OPT_NOACTION:
 			conf->noaction = 1;
 			break;
+        case ARGS_OPT_DOWNLOAD_ONLY:
+			conf->download_only = 1;
+			break;
 		case ':':
 			parse_err = -1;
 			break;
@@ -167,7 +206,7 @@ args_parse(int argc, char *argv[])
 			printf("Confusion: getopt_long returned %d\n", c);
 		}
 	}
-    
+
 	if (parse_err)
 		return parse_err;
 	else
@@ -182,7 +221,7 @@ usage()
 
 	printf("\nPackage Manipulation:\n");
 	printf("\tupdate			Update list of available packages\n");
-	printf("\tupgrade			Upgrade installed packages\n");
+	printf("\tupgrade <pkgs>		Upgrade packages\n");
 	printf("\tinstall <pkgs>		Install package(s)\n");
 	printf("\tconfigure <pkgs>	Configure unpacked package(s)\n");
 	printf("\tremove <pkgs|regexp>	Remove package(s)\n");
@@ -193,6 +232,7 @@ usage()
 	printf("\tlist			List available packages\n");
 	printf("\tlist-installed		List installed packages\n");
 	printf("\tlist-upgradable		List installed and upgradable packages\n");
+	printf("\tlist-changed-conffiles	List user modified configuration files\n");
 	printf("\tfiles <pkg>		List files belonging to <pkg>\n");
 	printf("\tsearch <file|regexp>	List package providing <file>\n");
 	printf("\tinfo [pkg|regexp]	Display all info for <pkg>\n");
@@ -201,16 +241,19 @@ usage()
 	printf("\tcompare-versions <v1> <op> <v2>\n");
 	printf("\t                    compare versions using <= < > >= = << >>\n");
 	printf("\tprint-architecture	List installable package architectures\n");
+	printf("\tdepends [-A] [pkgname|pat]+\n");
 	printf("\twhatdepends [-A] [pkgname|pat]+\n");
 	printf("\twhatdependsrec [-A] [pkgname|pat]+\n");
+	printf("\twhatrecommends[-A] [pkgname|pat]+\n");
+	printf("\twhatsuggests[-A] [pkgname|pat]+\n");
 	printf("\twhatprovides [-A] [pkgname|pat]+\n");
 	printf("\twhatconflicts [-A] [pkgname|pat]+\n");
 	printf("\twhatreplaces [-A] [pkgname|pat]+\n");
 
 	printf("\nOptions:\n");
-	printf("\t-A			Query all packages not just those installed\n"); 
-	printf("\t-V <level>		Set verbosity level to <level>.\n");
-	printf("\t--verbosity <level>	Verbosity levels:\n");
+	printf("\t-A			Query all packages not just those installed\n");
+	printf("\t-V[<level>]		Set verbosity level to <level>.\n");
+	printf("\t--verbosity[=<level>]	Verbosity levels:\n");
 	printf("\t				0 errors only\n");
 	printf("\t				1 normal messages (default)\n");
 	printf("\t				2 informative messages\n");
@@ -226,16 +269,21 @@ usage()
 	printf("				directory name in a pinch).\n");
 	printf("\t-o <dir>		Use <dir> as the root directory for\n");
 	printf("\t--offline-root <dir>	offline installation of packages.\n");
+	printf("\t--add-arch <arch>:<prio>	Register architecture with given priority\n");
+	printf("\t--add-dest <name>:<path>	Register destination with given path\n");
 
 	printf("\nForce Options:\n");
-	printf("\t--force-depends		Install/remove despite failed dependences\n");
+	printf("\t--force-depends		Install/remove despite failed dependencies\n");
 	printf("\t--force-maintainer	Overwrite preexisting config files\n");
 	printf("\t--force-reinstall	Reinstall package(s)\n");
 	printf("\t--force-overwrite	Overwrite files from other package(s)\n");
 	printf("\t--force-downgrade	Allow opkg to downgrade packages\n");
 	printf("\t--force-space		Disable free space checks\n");
+	printf("\t--force-postinstall	Run postinstall scripts even in offline mode\n");
+	printf("\t--force-remove	Remove package even if prerm script fails\n");
 	printf("\t--noaction		No action -- test only\n");
-	printf("\t--nodeps		Do not follow dependences\n");
+	printf("\t--download-only	No action -- download only\n");
+	printf("\t--nodeps		Do not follow dependencies\n");
 	printf("\t--force-removal-of-dependent-packages\n");
 	printf("\t			Remove package and all dependencies\n");
 	printf("\t--autoremove		Remove packages that were installed\n");
@@ -248,7 +296,7 @@ usage()
 	printf(" regexp could be something like 'pkgname*' '*file*' or similar\n");
 	printf(" e.g. opkg info 'libstd*' or opkg search '*libop*' or opkg remove 'libncur*'\n");
 
-	/* --force-removal-of-essential-packages	Let opkg remove essential packages. 
+	/* --force-removal-of-essential-packages	Let opkg remove essential packages.
 		Using this option is almost guaranteed to break your system, hence this option
 		is not even advertised in the usage statement. */
 
@@ -258,16 +306,19 @@ usage()
 int
 main(int argc, char *argv[])
 {
-	int opts;
+	int opts, err = -1;
 	char *cmd_name;
 	opkg_cmd_t *cmd;
 	int nocheckfordirorfile = 0;
         int noreadfeedsfile = 0;
 
+	if (opkg_conf_init())
+		goto err0;
+
+	conf->verbosity = NOTICE;
+
 	opts = args_parse(argc, argv);
 	if (opts == argc || opts < 0) {
-		fprintf (stderr, "%s: unknown sub-command %s\n", argv[0],
-			 cmd_name);
 		fprintf(stderr, "opkg must have one sub-command argument\n");
 		usage();
 	}
@@ -289,6 +340,8 @@ main(int argc, char *argv[])
 	    !strcmp(cmd_name,"compare-versions") ||
 	    !strcmp(cmd_name,"list_installed") ||
 	    !strcmp(cmd_name,"list-installed") ||
+	    !strcmp(cmd_name,"list_changed_conffiles") ||
+	    !strcmp(cmd_name,"list-changed-conffiles") ||
 	    !strcmp(cmd_name,"status") )
 		noreadfeedsfile = 1;
 
@@ -299,10 +352,9 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	conf->verbosity = NOTICE;	
 	conf->pfm = cmd->pfm;
 
-	if (opkg_conf_init())
+	if (opkg_conf_load())
 		goto err0;
 
 	if (!nocheckfordirorfile) {
@@ -310,7 +362,7 @@ main(int argc, char *argv[])
 			if (pkg_hash_load_feeds())
 				goto err1;
 		}
-   
+
 		if (pkg_hash_load_status_files())
 			goto err1;
 	}
@@ -322,15 +374,8 @@ main(int argc, char *argv[])
 		usage();
 	}
 
-	if (opkg_cmd_exec(cmd, argc - opts, (const char **) (argv + opts)))
-		goto err2;
-
-	print_error_list();
-	free_error_list();
-
-	return 0;
+	err = opkg_cmd_exec(cmd, argc - opts, (const char **) (argv + opts));
 
-err2:
 #ifdef HAVE_CURL
 	opkg_curl_cleanup();
 #endif
@@ -341,5 +386,5 @@ err0:
 	print_error_list();
 	free_error_list();
 
-	return -1;
+	return err;
 }