X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=864d2ac30992c43a6b9478dbd93acdb6b929f391;hp=cd636f12827207f6da90f366983f52afe3fcad1c;hb=0f54da55b8717543b08596e58c022ae49e70a184;hpb=fc9af348b882e9758bcfbddde05e2733eddb794a diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index cd636f1..864d2ac 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -47,13 +47,14 @@ 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 }, @@ -62,6 +63,7 @@ opkg_option_t options[] = { { "download_only", OPKG_OPT_TYPE_BOOL, &_conf.download_only }, { "nodeps", OPKG_OPT_TYPE_BOOL, &_conf.nodeps }, { "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 }, @@ -72,7 +74,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 }, @@ -89,15 +91,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) { @@ -156,7 +158,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) { @@ -176,15 +178,14 @@ opkg_conf_set_option(const char *name, const char *value) } i++; } - + opkg_msg(ERROR, "Unrecognized option: %s=%s\n", name, value); return -1; } 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 *pkg_src_list) { int line_num = 0; int err = 0; @@ -202,7 +203,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) @@ -267,7 +268,7 @@ opkg_conf_parse_file(const char *filename, regmatch[11].rm_eo - regmatch[11].rm_so); } - /* We use the tmp_dest_nv_pair_list below instead of + /* 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 @@ -290,7 +291,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) { @@ -359,7 +360,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; } @@ -408,10 +410,20 @@ glob_errfunc(const char *epath, int eerrno) int opkg_conf_init(void) +{ + pkg_src_list_init(&conf->pkg_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; glob_t globbuf; char *etc_opkg_conf_pattern; @@ -421,11 +433,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")); @@ -436,7 +443,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)) goto err1; } @@ -460,12 +467,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)<0) { globfree(&globbuf); goto err1; } @@ -486,7 +493,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) @@ -502,7 +513,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(); @@ -526,21 +537,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(); @@ -549,17 +560,20 @@ 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_dest_list_deinit(&conf->pkg_dest_list); @@ -575,7 +589,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) @@ -590,9 +604,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); @@ -614,7 +630,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); @@ -624,15 +640,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); + } }