s/dependences/dependencies/ Pointed out by klemmster in Issue 40.

[oweals/opkg-lede.git] / libopkg / opkg_conf.h

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index a268bba9140c7c72530ce4ca611198b41ffcc2fe..6e7aa7de4880b989e2f9198b12a726d9eb8e8eab 100644 (file)
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -21,10 +21,11 @@
 typedef struct opkg_conf opkg_conf_t;
 extern opkg_conf_t *conf;
 
+#include "config.h"
+
+#include <stdarg.h>
+
 #include "hash_table.h"
-#include "args.h"
-#include "pkg.h"
-#include "pkg_hash.h"
 #include "pkg_src_list.h"
 #include "pkg_dest_list.h"
 #include "nv_pair_list.h"
@@ -33,6 +34,8 @@ extern opkg_conf_t *conf;
 #define OPKG_CONF_TMP_DIR_SUFFIX "opkg-XXXXXX"
 #define OPKG_CONF_LISTS_DIR  OPKG_STATE_DIR_PREFIX "/lists"
 
+#define OPKG_CONF_DEFAULT_CONF_FILE_DIR OPKGETCDIR"/opkg"
+
 /* In case the config file defines no dest */
 #define OPKG_CONF_DEFAULT_DEST_NAME "root"
 #define OPKG_CONF_DEFAULT_DEST_ROOT_DIR "/"
@@ -47,11 +50,17 @@ struct opkg_conf
 
      int restrict_to_default_dest;
      pkg_dest_t *default_dest;
+     char *dest_str;
+
+     char *conf_file;
 
      char *tmp_dir;
      char *lists_dir;
 
-     uint pfm; /* package field mask */
+     unsigned int pfm; /* package field mask */
+
+     /* For libopkg users to capture messages. */
+     void (*opkg_vmessage)(int, const char *fmt, va_list ap);
 
      /* options */
      int autoremove;
@@ -65,11 +74,12 @@ struct opkg_conf
      int force_removal_of_dependent_packages;
      int force_removal_of_essential_packages;
      int check_signature;
-     int nodeps; /* do not follow dependences */
+     int nodeps; /* do not follow dependencies */
      char *offline_root;
      int query_all;
      int verbosity;
      int noaction;
+     int download_only;
      char *cache;
 
 #ifdef HAVE_SSLCURL
@@ -120,7 +130,7 @@ struct opkg_option {
      void * const value;
 };
 
-int opkg_conf_init(const args_t *args);
+int opkg_conf_init(void);
 void opkg_conf_deinit(void);
 
 int opkg_conf_write_status_files(void);