X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_conf.h;h=67b660fda5061fe1ab8799c4d9b249132ec82d89;hp=ecfe9ea874e8425131f7fff9315a764e41acf991;hb=df095ad14d4217ab3223862f3a6b9a2134c709b2;hpb=b3a54f7c2d686dbec049d3788f5096c01360c5c4

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index ecfe9ea..67b660f 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -19,9 +19,9 @@
 #define OPKG_CONF_H
 
 typedef struct opkg_conf opkg_conf_t;
+extern opkg_conf_t *conf;
 
 #include "hash_table.h"
-#include "args.h"
 #include "pkg.h"
 #include "pkg_hash.h"
 #include "pkg_src_list.h"
@@ -31,7 +31,8 @@ typedef struct opkg_conf opkg_conf_t;
 #define OPKG_CONF_DEFAULT_TMP_DIR_BASE "/tmp"
 #define OPKG_CONF_TMP_DIR_SUFFIX "opkg-XXXXXX"
 #define OPKG_CONF_LISTS_DIR  OPKG_STATE_DIR_PREFIX "/lists"
-#define OPKG_CONF_PENDING_DIR OPKG_STATE_DIR_PREFIX "/pending"
+
+#define OPKG_CONF_DEFAULT_CONF_FILE_DIR OPKGETCDIR"/opkg"
 
 /* In case the config file defines no dest */
 #define OPKG_CONF_DEFAULT_DEST_NAME "root"
@@ -41,17 +42,20 @@ typedef struct opkg_conf opkg_conf_t;
 
 struct opkg_conf
 {
-     int lock_fd; /* file descriptor for the lock file */
      pkg_src_list_t pkg_src_list;
      pkg_dest_list_t pkg_dest_list;
      nv_pair_list_t arch_list;
 
      int restrict_to_default_dest;
      pkg_dest_t *default_dest;
+     char *dest_str;
+
+     char *conf_file;
 
      char *tmp_dir;
      char *lists_dir;
-     char *pending_dir;
+
+     uint pfm; /* package field mask */
 
      /* options */
      int autoremove;
@@ -67,9 +71,6 @@ struct opkg_conf
      int check_signature;
      int nodeps; /* do not follow dependences */
      char *offline_root;
-     char *offline_root_path;
-     char *offline_root_pre_script_cmd;
-     char *offline_root_post_script_cmd;
      int query_all;
      int verbosity;
      int noaction;
@@ -90,6 +91,9 @@ struct opkg_conf
      char *ssl_ca_path;
      int ssl_dont_verify_peer;
 #endif
+#ifdef HAVE_PATHFINDER
+     int check_x509_path;
+#endif
 
      /* proxy options */
      char *http_proxy;
@@ -117,16 +121,13 @@ typedef struct opkg_option opkg_option_t;
 struct opkg_option {
      const char *name;
      const opkg_option_type_t type;
-     const void *value;
+     void * const value;
 };
 
-int opkg_conf_init(opkg_conf_t *conf, const args_t *args);
-void opkg_conf_deinit(opkg_conf_t *conf);
-
-int opkg_conf_write_status_files(opkg_conf_t *conf);
-char *root_filename_alloc(opkg_conf_t *conf, char *filename);
-
+int opkg_conf_init(void);
+void opkg_conf_deinit(void);
 
-int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options);
+int opkg_conf_write_status_files(void);
+char *root_filename_alloc(char *filename);
 
 #endif