X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=bf7a56313ad4ada36611a4207fe1a50e8f2bd48f;hp=d773c16828e3dfaa6064e78cd0203d0caa262f76;hb=e62fc971a19b43df377d8beee9e691ab179ca075;hpb=e19ce4d44b10a45f84e9c994ba3ddc81698a2cd9 diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index d773c16..bf7a563 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -16,25 +16,27 @@ General Public License for more details. */ -#include "includes.h" -#include "opkg_conf.h" +#include "config.h" +#include +#include +#include +#include +#include +#include + +#include "opkg_conf.h" +#include "pkg_vec.h" +#include "pkg.h" #include "xregex.h" #include "sprintf_alloc.h" -#include "args.h" #include "opkg_message.h" #include "file_util.h" #include "opkg_defines.h" #include "libbb/libbb.h" -#include -#include -#include -#include -#include - static int lock_fd; -char *lock_file; +static char *lock_file = NULL; static opkg_conf_t _conf; opkg_conf_t *conf = &_conf; @@ -45,20 +47,24 @@ opkg_conf_t *conf = &_conf; opkg_option_t options[] = { { "cache", OPKG_OPT_TYPE_STRING, &_conf.cache}, { "force_defaults", OPKG_OPT_TYPE_BOOL, &_conf.force_defaults }, - { "force_maintainer", OPKG_OPT_TYPE_BOOL, &_conf.force_maintainer }, + { "force_maintainer", OPKG_OPT_TYPE_BOOL, &_conf.force_maintainer }, { "force_depends", OPKG_OPT_TYPE_BOOL, &_conf.force_depends }, { "force_overwrite", OPKG_OPT_TYPE_BOOL, &_conf.force_overwrite }, { "force_downgrade", OPKG_OPT_TYPE_BOOL, &_conf.force_downgrade }, { "force_reinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_reinstall }, { "force_space", OPKG_OPT_TYPE_BOOL, &_conf.force_space }, - { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature }, + { "force_postinstall", OPKG_OPT_TYPE_BOOL, &_conf.force_postinstall }, + { "check_signature", OPKG_OPT_TYPE_BOOL, &_conf.check_signature }, { "ftp_proxy", OPKG_OPT_TYPE_STRING, &_conf.ftp_proxy }, { "http_proxy", OPKG_OPT_TYPE_STRING, &_conf.http_proxy }, { "no_proxy", OPKG_OPT_TYPE_STRING, &_conf.no_proxy }, { "test", OPKG_OPT_TYPE_BOOL, &_conf.noaction }, { "noaction", OPKG_OPT_TYPE_BOOL, &_conf.noaction }, + { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only }, { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps }, + { "nocase", OPKG_OPT_TYPE_BOOL, &_conf.nocase }, { "offline_root", OPKG_OPT_TYPE_STRING, &_conf.offline_root }, + { "overlay_root", OPKG_OPT_TYPE_STRING, &_conf.overlay_root }, { "proxy_passwd", OPKG_OPT_TYPE_STRING, &_conf.proxy_passwd }, { "proxy_user", OPKG_OPT_TYPE_STRING, &_conf.proxy_user }, { "query-all", OPKG_OPT_TYPE_BOOL, &_conf.query_all }, @@ -69,7 +75,7 @@ opkg_option_t options[] = { { "signature_ca_path", OPKG_OPT_TYPE_STRING, &_conf.signature_ca_path }, #endif #if defined(HAVE_PATHFINDER) - { "check_x509_path", OPKG_OPT_TYPE_BOOL, &_conf.check_x509_path }, + { "check_x509_path", OPKG_OPT_TYPE_BOOL, &_conf.check_x509_path }, #endif #if defined(HAVE_SSLCURL) && defined(HAVE_CURL) { "ssl_engine", OPKG_OPT_TYPE_STRING, &_conf.ssl_engine }, @@ -86,15 +92,15 @@ opkg_option_t options[] = { }; static int -resolve_pkg_dest_list(nv_pair_list_t *nv_pair_list) +resolve_pkg_dest_list(void) { nv_pair_list_elt_t *iter; nv_pair_t *nv_pair; pkg_dest_t *dest; char *root_dir; - for (iter = nv_pair_list_first(nv_pair_list); iter; - iter = nv_pair_list_next(nv_pair_list, iter)) { + for (iter = nv_pair_list_first(&conf->tmp_dest_list); iter; + iter = nv_pair_list_next(&conf->tmp_dest_list, iter)) { nv_pair = (nv_pair_t *)iter->data; if (conf->offline_root) { @@ -153,7 +159,7 @@ opkg_conf_set_option(const char *name, const char *value) opkg_msg(ERROR, "Option %s needs an argument\n", name); return -1; - } + } case OPKG_OPT_TYPE_STRING: if (value) { if (*(char **)options[i].value) { @@ -173,7 +179,7 @@ opkg_conf_set_option(const char *name, const char *value) } i++; } - + opkg_msg(ERROR, "Unrecognized option: %s=%s\n", name, value); return -1; } @@ -181,13 +187,13 @@ opkg_conf_set_option(const char *name, const char *value) static int opkg_conf_parse_file(const char *filename, pkg_src_list_t *pkg_src_list, - nv_pair_list_t *tmp_dest_nv_pair_list) + pkg_src_list_t *dist_src_list) { int line_num = 0; int err = 0; FILE *file; regex_t valid_line_re, comment_re; -#define regmatch_size 12 +#define regmatch_size 14 regmatch_t regmatch[regmatch_size]; file = fopen(filename, "r"); @@ -199,7 +205,7 @@ opkg_conf_parse_file(const char *filename, opkg_msg(INFO, "Loading conf file %s.\n", filename); - err = xregcomp(&comment_re, + err = xregcomp(&comment_re, "^[[:space:]]*(#.*|[[:space:]]*)$", REG_EXTENDED); if (err) @@ -209,7 +215,7 @@ opkg_conf_parse_file(const char *filename, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" - "([[:space:]]+([^[:space:]]+))?[[:space:]]*$", + "([[:space:]]+([^[:space:]]+))?([[:space:]]+(.*))?[[:space:]]*$", REG_EXTENDED); if (err) goto err2; @@ -260,11 +266,20 @@ opkg_conf_parse_file(const char *filename, extra = NULL; if (regmatch[11].rm_so > 0) { + if (regmatch[13].rm_so > 0 && regmatch[13].rm_so!=regmatch[13].rm_eo ) + extra = xstrndup (line + regmatch[11].rm_so, + regmatch[13].rm_eo - regmatch[11].rm_so); + else extra = xstrndup (line + regmatch[11].rm_so, regmatch[11].rm_eo - regmatch[11].rm_so); } - /* We use the tmp_dest_nv_pair_list below instead of + if (regmatch[13].rm_so!=regmatch[13].rm_eo && strncmp(type, "dist", 4)!=0) { + opkg_msg(ERROR, "%s:%d: Ignoring config line with trailing garbage: `%s'\n", + filename, line_num, line); + } else { + + /* We use the conf->tmp_dest_list below instead of conf->pkg_dest_list because we might encounter an offline_root option later and that would invalidate the directories we would have computed in @@ -272,6 +287,20 @@ opkg_conf_parse_file(const char *filename, tmp_src_nv_pair_list for sake of symmetry.) */ if (strcmp(type, "option") == 0) { opkg_conf_set_option(name, value); + } else if (strcmp(type, "dist") == 0) { + if (!nv_pair_list_find((nv_pair_list_t*) dist_src_list, name)) { + pkg_src_list_append (dist_src_list, name, value, extra, 0); + } else { + opkg_msg(ERROR, "Duplicate dist declaration (%s %s). " + "Skipping.\n", name, value); + } + } else if (strcmp(type, "dist/gz") == 0) { + if (!nv_pair_list_find((nv_pair_list_t*) dist_src_list, name)) { + pkg_src_list_append (dist_src_list, name, value, extra, 1); + } else { + opkg_msg(ERROR, "Duplicate dist declaration (%s %s). " + "Skipping.\n", name, value); + } } else if (strcmp(type, "src") == 0) { if (!nv_pair_list_find((nv_pair_list_t*) pkg_src_list, name)) { pkg_src_list_append (pkg_src_list, name, value, extra, 0); @@ -287,7 +316,7 @@ opkg_conf_parse_file(const char *filename, "Skipping.\n", name, value); } } else if (strcmp(type, "dest") == 0) { - nv_pair_list_append(tmp_dest_nv_pair_list, name, value); + nv_pair_list_append(&conf->tmp_dest_list, name, value); } else if (strcmp(type, "lists_dir") == 0) { conf->lists_dir = xstrdup(value); } else if (strcmp(type, "arch") == 0) { @@ -303,6 +332,8 @@ opkg_conf_parse_file(const char *filename, filename, line_num, line); } + } + free(type); free(name); free(value); @@ -341,7 +372,7 @@ opkg_conf_write_status_files(void) dest = (pkg_dest_t *)iter->data; dest->status_fp = fopen(dest->status_file_name, "w"); - if (dest->status_fp == NULL) { + if (dest->status_fp == NULL && errno != EROFS) { opkg_perror(ERROR, "Can't open status file %s", dest->status_file_name); ret = -1; @@ -356,7 +387,8 @@ opkg_conf_write_status_files(void) /* We don't need most uninstalled packages in the status file */ if (pkg->state_status == SS_NOT_INSTALLED && (pkg->state_want == SW_UNKNOWN - || pkg->state_want == SW_DEINSTALL + || (pkg->state_want == SW_DEINSTALL + && pkg->state_flag != SF_HOLD) || pkg->state_want == SW_PURGE)) { continue; } @@ -373,7 +405,7 @@ opkg_conf_write_status_files(void) list_for_each_entry(iter, &conf->pkg_dest_list.head, node) { dest = (pkg_dest_t *)iter->data; - if (fclose(dest->status_fp) == EOF) { + if (dest->status_fp && fclose(dest->status_fp) == EOF) { opkg_perror(ERROR, "Couldn't close %s", dest->status_file_name); ret = -1; } @@ -392,13 +424,34 @@ root_filename_alloc(char *filename) return root_filename; } +static int +glob_errfunc(const char *epath, int eerrno) +{ + if (eerrno == ENOENT) + /* If leading dir does not exist, we get GLOB_NOMATCH. */ + return 0; + + opkg_msg(ERROR, "glob failed for %s: %s\n", epath, strerror(eerrno)); + return 0; +} + int opkg_conf_init(void) { - int i; + pkg_src_list_init(&conf->pkg_src_list); + pkg_src_list_init(&conf->dist_src_list); + pkg_dest_list_init(&conf->pkg_dest_list); + pkg_dest_list_init(&conf->tmp_dest_list); + nv_pair_list_init(&conf->arch_list); + + return 0; +} + +int +opkg_conf_load(void) +{ + int i, glob_ret; char *tmp, *tmp_dir_base, **tmp_val; - nv_pair_list_t tmp_dest_nv_pair_list; - char *lock_file = NULL; glob_t globbuf; char *etc_opkg_conf_pattern; @@ -408,11 +461,6 @@ opkg_conf_init(void) conf->check_x509_path = 1; #endif - pkg_src_list_init(&conf->pkg_src_list); - pkg_dest_list_init(&conf->pkg_dest_list); - nv_pair_list_init(&conf->arch_list); - nv_pair_list_init(&tmp_dest_nv_pair_list); - if (!conf->offline_root) conf->offline_root = xstrdup(getenv("OFFLINE_ROOT")); @@ -423,7 +471,7 @@ opkg_conf_init(void) goto err0; } if (opkg_conf_parse_file(conf->conf_file, - &conf->pkg_src_list, &tmp_dest_nv_pair_list)) + &conf->pkg_src_list, &conf->dist_src_list)) goto err1; } @@ -437,7 +485,8 @@ opkg_conf_init(void) } memset(&globbuf, 0, sizeof(globbuf)); - if (glob(etc_opkg_conf_pattern, 0, NULL, &globbuf)) { + glob_ret = glob(etc_opkg_conf_pattern, 0, glob_errfunc, &globbuf); + if (glob_ret && glob_ret != GLOB_NOMATCH) { free(etc_opkg_conf_pattern); globfree(&globbuf); goto err1; @@ -446,12 +495,12 @@ opkg_conf_init(void) free(etc_opkg_conf_pattern); for (i = 0; i < globbuf.gl_pathc; i++) { - if (globbuf.gl_pathv[i]) + if (globbuf.gl_pathv[i]) if (conf->conf_file && !strcmp(conf->conf_file, globbuf.gl_pathv[i])) continue; - if ( opkg_conf_parse_file(globbuf.gl_pathv[i], - &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) { + if ( opkg_conf_parse_file(globbuf.gl_pathv[i], + &conf->pkg_src_list, &conf->dist_src_list)<0) { globfree(&globbuf); goto err1; } @@ -460,9 +509,9 @@ opkg_conf_init(void) globfree(&globbuf); if (conf->offline_root) - sprintf_alloc (&lock_file, "%s/%s/lock", conf->offline_root, OPKG_STATE_DIR_PREFIX); + sprintf_alloc (&lock_file, "%s/%s", conf->offline_root, OPKGLOCKFILE); else - sprintf_alloc (&lock_file, "%s/lock", OPKG_STATE_DIR_PREFIX); + sprintf_alloc (&lock_file, "%s", OPKGLOCKFILE); lock_fd = creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP); if (lock_fd == -1) { @@ -472,7 +521,11 @@ opkg_conf_init(void) if (lockf(lock_fd, F_TLOCK, (off_t)0) == -1) { opkg_perror(ERROR, "Could not lock %s", lock_file); - goto err3; + if (close(lock_fd) == -1) + opkg_perror(ERROR, "Couldn't close descriptor %d (%s)", + lock_fd, lock_file); + lock_fd = -1; + goto err2; } if (conf->tmp_dir) @@ -488,7 +541,7 @@ opkg_conf_init(void) conf->tmp_dir = mkdtemp(tmp); if (conf->tmp_dir == NULL) { opkg_perror(ERROR, "Creating temp dir %s failed", tmp); - goto err4; + goto err3; } pkg_hash_init(); @@ -512,21 +565,21 @@ opkg_conf_init(void) } /* Even if there is no conf file, we'll need at least one dest. */ - if (nv_pair_list_empty(&tmp_dest_nv_pair_list)) { - nv_pair_list_append(&tmp_dest_nv_pair_list, + if (nv_pair_list_empty(&conf->tmp_dest_list)) { + nv_pair_list_append(&conf->tmp_dest_list, OPKG_CONF_DEFAULT_DEST_NAME, OPKG_CONF_DEFAULT_DEST_ROOT_DIR); } - if (resolve_pkg_dest_list(&tmp_dest_nv_pair_list)) - goto err5; + if (resolve_pkg_dest_list()) + goto err4; - nv_pair_list_deinit(&tmp_dest_nv_pair_list); + nv_pair_list_deinit(&conf->tmp_dest_list); return 0; -err5: +err4: free(conf->lists_dir); pkg_hash_deinit(); @@ -535,19 +588,23 @@ err5: if (rmdir(conf->tmp_dir) == -1) opkg_perror(ERROR, "Couldn't remove dir %s", conf->tmp_dir); -err4: +err3: if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1) opkg_perror(ERROR, "Couldn't unlock %s", lock_file); -err3: + if (close(lock_fd) == -1) opkg_perror(ERROR, "Couldn't close descriptor %d (%s)", lock_fd, lock_file); if (unlink(lock_file) == -1) opkg_perror(ERROR, "Couldn't unlink %s", lock_file); err2: - free(lock_file); + if (lock_file) { + free(lock_file); + lock_file = NULL; + } err1: pkg_src_list_deinit(&conf->pkg_src_list); + pkg_src_list_deinit(&conf->dist_src_list); pkg_dest_list_deinit(&conf->pkg_dest_list); nv_pair_list_deinit(&conf->arch_list); @@ -561,7 +618,7 @@ err1: } } err0: - nv_pair_list_deinit(&tmp_dest_nv_pair_list); + nv_pair_list_deinit(&conf->tmp_dest_list); if (conf->dest_str) free(conf->dest_str); if (conf->conf_file) @@ -576,9 +633,11 @@ opkg_conf_deinit(void) int i; char **tmp; - rm_r(conf->tmp_dir); + if (conf->tmp_dir) + rm_r(conf->tmp_dir); - free(conf->lists_dir); + if (conf->lists_dir) + free(conf->lists_dir); if (conf->dest_str) free(conf->dest_str); @@ -587,6 +646,7 @@ opkg_conf_deinit(void) free(conf->conf_file); pkg_src_list_deinit(&conf->pkg_src_list); + pkg_src_list_deinit(&conf->dist_src_list); pkg_dest_list_deinit(&conf->pkg_dest_list); nv_pair_list_deinit(&conf->arch_list); @@ -600,7 +660,7 @@ opkg_conf_deinit(void) } } - if (conf->verbosity >= DEBUG) { + if (conf->verbosity >= DEBUG) { hash_print_stats(&conf->pkg_hash); hash_print_stats(&conf->file_hash); hash_print_stats(&conf->obs_file_hash); @@ -610,15 +670,20 @@ opkg_conf_deinit(void) hash_table_deinit(&conf->file_hash); hash_table_deinit(&conf->obs_file_hash); - if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1) - opkg_perror(ERROR, "Couldn't unlock %s", lock_file); + if (lock_fd != -1) { + if (lockf(lock_fd, F_ULOCK, (off_t)0) == -1) + opkg_perror(ERROR, "Couldn't unlock %s", lock_file); - if (close(lock_fd) == -1) - opkg_perror(ERROR, "Couldn't close descriptor %d (%s)", - lock_fd, lock_file); + if (close(lock_fd) == -1) + opkg_perror(ERROR, "Couldn't close descriptor %d (%s)", + lock_fd, lock_file); - if (unlink(lock_file) == -1) - opkg_perror(ERROR, "Couldn't unlink %s", lock_file); + } - free(lock_file); + if (lock_file) { + if (unlink(lock_file) == -1) + opkg_perror(ERROR, "Couldn't unlink %s", lock_file); + + free(lock_file); + } }