X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Flibopkg.c;h=d86be9eb2b8ac7f16fe0f2f5a7d75a94b76f0edd;hp=312198407b0bc4475594c31179b0290a93f04e42;hb=3f2c4682812060e659b5cc087afa7750e9f67e49;hpb=dc51de137b84352e22ad99911607779658816ae1

diff --git a/libopkg/libopkg.c b/libopkg/libopkg.c
index 3121984..d86be9e 100644
--- a/libopkg/libopkg.c
+++ b/libopkg/libopkg.c
@@ -16,47 +16,41 @@
 */
 
 #include "includes.h"
-#include "libopkg.h"
 
-#include "args.h"
 #include "opkg_conf.h"
 #include "opkg_cmd.h"
 #include "file_util.h"
+#include "args.h"
+#include "opkg_download.h"
 
 #include "opkg_message.h"
-#include "opkg_error.h"
 
-/* This is used for backward compatibility */
+/* This is used for backwards compatibility */
 int
 opkg_op (int argc, char *argv[])
 {
-	int err, optind;
-	args_t args;
+	int opts;
 	char *cmd_name;
 	opkg_cmd_t *cmd;
-	opkg_conf_t opkg_conf;
+	int nocheckfordirorfile = 0;
+        int noreadfeedsfile = 0;
 
-	args_init (&args);
+	conf->verbosity = NOTICE;	
 
-	optind = args_parse (&args, argc, argv);
-	if (optind == argc || optind < 0)
+	opts = args_parse (argc, argv);
+	if (opts == argc || opts < 0)
 	{
 		args_usage ("opkg must have one sub-command argument");
 	}
 
-	cmd_name = argv[optind++];
-/* Pigi: added a flag to disable the checking of structures if the command does not need to 
-         read anything from there.
-*/
+	cmd_name = argv[opts++];
+
         if ( !strcmp(cmd_name,"print-architecture") ||
              !strcmp(cmd_name,"print_architecture") ||
              !strcmp(cmd_name,"print-installation-architecture") ||
              !strcmp(cmd_name,"print_installation_architecture") )
-           args.nocheckfordirorfile = 1;
+           nocheckfordirorfile = 1;
 
-/* Pigi: added a flag to disable the reading of feed files  if the command does not need to 
-         read anything from there.
-*/
         if ( !strcmp(cmd_name,"flag") ||
              !strcmp(cmd_name,"configure") ||
              !strcmp(cmd_name,"remove") ||
@@ -67,17 +61,7 @@ opkg_op (int argc, char *argv[])
              !strcmp(cmd_name,"list_installed") ||
              !strcmp(cmd_name,"list-installed") ||
              !strcmp(cmd_name,"status") )
-           args.noreadfeedsfile = 1;
-
-
-	err = opkg_conf_init (&opkg_conf, &args);
-	args_deinit (&args);
-	if (err)
-	{
-		print_error_list();
-		free_error_list();
-		return err;
-	}
+           noreadfeedsfile = 1;
 
 	cmd = opkg_cmd_find (cmd_name);
 	if (cmd == NULL)
@@ -87,20 +71,47 @@ opkg_op (int argc, char *argv[])
 		args_usage (NULL);
 	}
 
-	if (cmd->requires_args && optind == argc)
+	conf->pfm = cmd->pfm;
+
+	if (opkg_conf_init())
+		goto err0;
+
+	if (!nocheckfordirorfile) {
+		if (!noreadfeedsfile) {
+			if (pkg_hash_load_feeds())
+				goto err1;
+		}
+   
+		if (pkg_hash_load_status_files())
+			goto err1;
+	}
+
+	if (cmd->requires_args && opts == argc)
 	{
 		fprintf (stderr,
 			 "%s: the ``%s'' command requires at least one argument\n",
-			 __FUNCTION__, cmd_name);
+			 argv[0], cmd_name);
 		args_usage (NULL);
 	}
 
-	err = opkg_cmd_exec (cmd, &opkg_conf, argc - optind, (const char **) (argv + optind), NULL);
+	if (opkg_cmd_exec (cmd, argc - opts, (const char **) (argv + opts)))
+		goto err2;
+
+	print_error_list();
+	free_error_list();
 
+	return 0;
+
+err2:
 #ifdef HAVE_CURL
 	opkg_curl_cleanup();
 #endif
-	opkg_conf_deinit (&opkg_conf);
+err1:
+	opkg_conf_deinit ();
+
+err0:
+	print_error_list();
+	free_error_list();
 
-	return err;
+	return -1;
 }