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

diff --git a/libopkg/opkg_conf.h b/libopkg/opkg_conf.h
index ecfe9ea..9cf7681 100644
--- a/libopkg/opkg_conf.h
+++ b/libopkg/opkg_conf.h
@@ -19,11 +19,12 @@
 #define OPKG_CONF_H
 
 typedef struct opkg_conf opkg_conf_t;
+extern opkg_conf_t *conf;
+
+#include <stdarg.h>
+#include <fnmatch.h>		/* FNM_CASEFOLD */
 
 #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"
@@ -31,7 +32,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"
@@ -39,94 +41,88 @@ typedef struct opkg_conf opkg_conf_t;
 
 #define OPKG_CONF_DEFAULT_HASH_LEN 1024
 
-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 *tmp_dir;
-     char *lists_dir;
-     char *pending_dir;
-
-     /* options */
-     int autoremove;
-     int force_depends;
-     int force_defaults;
-     int force_maintainer;
-     int force_overwrite;
-     int force_downgrade;
-     int force_reinstall;
-     int force_space;
-     int force_removal_of_dependent_packages;
-     int force_removal_of_essential_packages;
-     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;
-     char *cache;
-
-#ifdef HAVE_SSLCURL
-     /* some options could be used by
-      * wget if curl support isn't builtin
-      * If someone want to try...
-      */
-     char *ssl_engine;
-     char *ssl_cert;
-     char *ssl_cert_type;
-     char *ssl_key;
-     char *ssl_key_type;
-     char *ssl_key_passwd;
-     char *ssl_ca_file;
-     char *ssl_ca_path;
-     int ssl_dont_verify_peer;
-#endif
-
-     /* proxy options */
-     char *http_proxy;
-     char *ftp_proxy;
-     char *no_proxy;
-     char *proxy_user;
-     char *proxy_passwd;
-
-     char *signature_ca_file;
-     char *signature_ca_path;
-
-     hash_table_t pkg_hash;
-     hash_table_t file_hash;
-     hash_table_t obs_file_hash;
+struct opkg_conf {
+	pkg_src_list_t pkg_src_list;
+	pkg_src_list_t dist_src_list;
+	pkg_dest_list_t pkg_dest_list;
+	pkg_dest_list_t tmp_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;
+
+	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;
+	int force_depends;
+	int force_defaults;
+	int force_maintainer;
+	int force_overwrite;
+	int force_downgrade;
+	int force_reinstall;
+	int force_space;
+	int force_removal_of_dependent_packages;
+	int force_removal_of_essential_packages;
+	int force_postinstall;
+	int force_remove;
+	int force_checksum;
+	int check_signature;
+	int force_signature;
+	int nodeps;		/* do not follow dependencies */
+	int nocase;		/* perform case insensitive matching */
+	char *offline_root;
+	char *overlay_root;
+	int query_all;
+	int verbosity;
+	int noaction;
+	int size;
+	int download_only;
+	char *cache;
+
+	/* proxy options */
+	char *http_proxy;
+	char *ftp_proxy;
+	char *no_proxy;
+	char *proxy_user;
+	char *proxy_passwd;
+
+	char *signature_ca_file;
+	char *signature_ca_path;
+
+	hash_table_t pkg_hash;
+	hash_table_t file_hash;
+	hash_table_t obs_file_hash;
 };
 
 enum opkg_option_type {
-     OPKG_OPT_TYPE_BOOL,
-     OPKG_OPT_TYPE_INT,
-     OPKG_OPT_TYPE_STRING
+	OPKG_OPT_TYPE_BOOL,
+	OPKG_OPT_TYPE_INT,
+	OPKG_OPT_TYPE_STRING
 };
 typedef enum opkg_option_type opkg_option_type_t;
 
 typedef struct opkg_option opkg_option_t;
 struct opkg_option {
-     const char *name;
-     const opkg_option_type_t type;
-     const void *value;
+	const char *name;
+	const opkg_option_type_t type;
+	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);
+int opkg_conf_load(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