X-Git-Url: https://git.librecmc.org/?p=oweals%2Fopkg-lede.git;a=blobdiff_plain;f=libopkg%2Fopkg_conf.c;h=864d2ac30992c43a6b9478dbd93acdb6b929f391;hp=1afa612e924676a14ff711f16be3c799f57c8754;hb=0f54da55b8717543b08596e58c022ae49e70a184;hpb=993e14cd113fccd973c35fd1322625804d5e5142 diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c index 1afa612..864d2ac 100644 --- a/libopkg/opkg_conf.c +++ b/libopkg/opkg_conf.c @@ -1,7 +1,8 @@ /* opkg_conf.c - the opkg package management system - Carl D. Worth + Copyright (C) 2009 Ubiq Technologies + Carl D. Worth Copyright (C) 2001 University of Southern California This program is free software; you can redistribute it and/or @@ -15,24 +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; +static char *lock_file = NULL; static opkg_conf_t _conf; opkg_conf_t *conf = &_conf; @@ -43,20 +47,23 @@ 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 }, { "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 }, @@ -67,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 }, @@ -84,14 +91,15 @@ opkg_option_t options[] = { }; static int -resolve_pkg_dest_list(nv_pair_list_t *nv_pair_list, const char *default_dest_name) +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) { @@ -106,14 +114,14 @@ resolve_pkg_dest_list(nv_pair_list_t *nv_pair_list, const char *default_dest_nam if (conf->default_dest == NULL) conf->default_dest = dest; - if (default_dest_name && !strcmp(dest->name, default_dest_name)) { + if (conf->dest_str && !strcmp(dest->name, conf->dest_str)) { conf->default_dest = dest; conf->restrict_to_default_dest = 1; } } - if (default_dest_name && !conf->restrict_to_default_dest) { - opkg_msg(ERROR, "Unknown dest name: `%s'.\n", default_dest_name); + if (conf->dest_str && !conf->restrict_to_default_dest) { + opkg_msg(ERROR, "Unknown dest name: `%s'.\n", conf->dest_str); return -1; } @@ -124,6 +132,7 @@ static int opkg_conf_set_option(const char *name, const char *value) { int i = 0; + while (options[i].name) { if (strcmp(options[i].name, name) == 0) { switch (options[i].type) { @@ -149,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) { @@ -169,17 +178,17 @@ 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 err; + int line_num = 0; + int err = 0; FILE *file; regex_t valid_line_re, comment_re; #define regmatch_size 12 @@ -188,36 +197,39 @@ opkg_conf_parse_file(const char *filename, file = fopen(filename, "r"); if (file == NULL) { opkg_perror(ERROR, "Failed to open %s", filename); - return -1; + err = -1; + goto err0; } opkg_msg(INFO, "Loading conf file %s.\n", filename); - err = xregcomp(&comment_re, + err = xregcomp(&comment_re, "^[[:space:]]*(#.*|[[:space:]]*)$", REG_EXTENDED); - if (err) { - return -1; - } - err = xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED); - if (err) { - return -1; - } + if (err) + goto err1; + + err = xregcomp(&valid_line_re, + "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" + "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" + "[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))" + "([[:space:]]+([^[:space:]]+))?[[:space:]]*$", + REG_EXTENDED); + if (err) + goto err2; while(1) { - int line_num = 0; char *line; char *type, *name, *value, *extra; - line = file_read_line_alloc(file); line_num++; - if (line == NULL) { + + line = file_read_line_alloc(file); + if (line == NULL) break; - } - if (regexec(&comment_re, line, 0, 0, 0) == 0) { + if (regexec(&comment_re, line, 0, 0, 0) == 0) goto NEXT_LINE; - } if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) { opkg_msg(ERROR, "%s:%d: Ignoring invalid line: `%s'\n", @@ -233,6 +245,7 @@ opkg_conf_parse_file(const char *filename, type = xstrndup(line + regmatch[3].rm_so, regmatch[3].rm_eo - regmatch[3].rm_so); } + if (regmatch[5].rm_so > 0) { name = xstrndup(line + regmatch[5].rm_so, regmatch[5].rm_eo - regmatch[5].rm_so); @@ -240,6 +253,7 @@ opkg_conf_parse_file(const char *filename, name = xstrndup(line + regmatch[6].rm_so, regmatch[6].rm_eo - regmatch[6].rm_so); } + if (regmatch[8].rm_so > 0) { value = xstrndup(line + regmatch[8].rm_so, regmatch[8].rm_eo - regmatch[8].rm_so); @@ -247,13 +261,14 @@ opkg_conf_parse_file(const char *filename, value = xstrndup(line + regmatch[9].rm_so, regmatch[9].rm_eo - regmatch[9].rm_so); } + extra = NULL; if (regmatch[11].rm_so > 0) { 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 + /* 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 @@ -276,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) { @@ -288,26 +303,30 @@ opkg_conf_parse_file(const char *filename, } nv_pair_list_append(&conf->arch_list, name, value); } else { - opkg_msg(ERROR, "Ignoring unknown configuration " - "parameter: %s %s %s\n", type, name, value); - return -1; + opkg_msg(ERROR, "%s:%d: Ignoring invalid line: `%s'\n", + filename, line_num, line); } free(type); free(name); free(value); if (extra) - free (extra); + free(extra); - NEXT_LINE: +NEXT_LINE: free(line); } - regfree(&comment_re); regfree(&valid_line_re); - fclose(file); - - return 0; +err2: + regfree(&comment_re); +err1: + if (fclose(file) == EOF) { + opkg_perror(ERROR, "Couldn't close %s", filename); + err = -1; + } +err0: + return err; } int @@ -326,7 +345,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; @@ -341,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; } @@ -358,7 +378,10 @@ opkg_conf_write_status_files(void) list_for_each_entry(iter, &conf->pkg_dest_list.head, node) { dest = (pkg_dest_t *)iter->data; - fclose(dest->status_fp); + if (dest->status_fp && fclose(dest->status_fp) == EOF) { + opkg_perror(ERROR, "Couldn't close %s", dest->status_file_name); + ret = -1; + } } return ret; @@ -374,141 +397,205 @@ 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(const args_t *args) +opkg_conf_init(void) { - int err; - char *tmp_dir_base, *tmp2; - nv_pair_list_t tmp_dest_nv_pair_list; - char *lock_file = NULL; - glob_t globbuf; - char *etc_opkg_conf_pattern; - - conf->restrict_to_default_dest = 0; - conf->default_dest = NULL; + 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; + glob_t globbuf; + char *etc_opkg_conf_pattern; + + conf->restrict_to_default_dest = 0; + conf->default_dest = NULL; #if defined(HAVE_PATHFINDER) - conf->check_x509_path = 1; + conf->check_x509_path = 1; #endif - pkg_src_list_init(&conf->pkg_src_list); + if (!conf->offline_root) + conf->offline_root = xstrdup(getenv("OFFLINE_ROOT")); - nv_pair_list_init(&tmp_dest_nv_pair_list); - pkg_dest_list_init(&conf->pkg_dest_list); + if (conf->conf_file) { + struct stat st; + if (stat(conf->conf_file, &st) == -1) { + opkg_perror(ERROR, "Couldn't stat %s", conf->conf_file); + goto err0; + } + if (opkg_conf_parse_file(conf->conf_file, + &conf->pkg_src_list)) + goto err1; + } - nv_pair_list_init(&conf->arch_list); + if (conf->offline_root) + sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root); + else { + const char *conf_file_dir = getenv("OPKG_CONF_DIR"); + if (conf_file_dir == NULL) + conf_file_dir = OPKG_CONF_DEFAULT_CONF_FILE_DIR; + sprintf_alloc(&etc_opkg_conf_pattern, "%s/*.conf", conf_file_dir); + } - if (!conf->offline_root) - conf->offline_root = xstrdup(getenv("OFFLINE_ROOT")); + memset(&globbuf, 0, sizeof(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; + } - if (args->conf_file) { - struct stat stat_buf; - err = stat(args->conf_file, &stat_buf); - if (err == 0) - if (opkg_conf_parse_file(args->conf_file, - &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) { - /* Memory leakage from opkg_conf_parse-file */ - return -1; - } - } + free(etc_opkg_conf_pattern); + + for (i = 0; i < globbuf.gl_pathc; 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)<0) { + globfree(&globbuf); + goto err1; + } + } - if (conf->offline_root) - sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root); - else { - const char *conf_file_dir = getenv("OPKG_CONF_DIR"); - if (conf_file_dir == NULL) - conf_file_dir = ARGS_DEFAULT_CONF_FILE_DIR; - sprintf_alloc(&etc_opkg_conf_pattern, "%s/*.conf", conf_file_dir); - } - memset(&globbuf, 0, sizeof(globbuf)); - err = glob(etc_opkg_conf_pattern, 0, NULL, &globbuf); - free (etc_opkg_conf_pattern); - if (!err) { - int i; - for (i = 0; i < globbuf.gl_pathc; i++) { - if (globbuf.gl_pathv[i]) - if (args->conf_file && - !strcmp(args->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) { - /* Memory leakage from opkg_conf_parse-file */ - return -1; - } - } - } - globfree(&globbuf); - - /* check for lock file */ - if (conf->offline_root) - sprintf_alloc (&lock_file, "%s/%s/lock", conf->offline_root, OPKG_STATE_DIR_PREFIX); - else - sprintf_alloc (&lock_file, "%s/lock", OPKG_STATE_DIR_PREFIX); - - lock_fd = creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP); - if (lock_fd == -1) { - opkg_perror(ERROR, "Could not create lock file %s", lock_file); - free(lock_file); - return -1; - } + globfree(&globbuf); - if (lockf(lock_fd, F_TLOCK, (off_t)0) == -1) { - opkg_perror(ERROR, "Could not lock %s", lock_file); - free(lock_file); - return -1; - } + if (conf->offline_root) + sprintf_alloc (&lock_file, "%s/%s", conf->offline_root, OPKGLOCKFILE); + else + sprintf_alloc (&lock_file, "%s", OPKGLOCKFILE); - free(lock_file); - - if (conf->tmp_dir) - tmp_dir_base = conf->tmp_dir; - else - tmp_dir_base = getenv("TMPDIR"); - sprintf_alloc(&tmp2, "%s/%s", - tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE, - OPKG_CONF_TMP_DIR_SUFFIX); - if (conf->tmp_dir) - free(conf->tmp_dir); - conf->tmp_dir = mkdtemp(tmp2); - if (conf->tmp_dir == NULL) { - opkg_perror(ERROR, "Creating temp dir %s failed", tmp2); - return -1; - } + lock_fd = creat(lock_file, S_IRUSR | S_IWUSR | S_IRGRP); + if (lock_fd == -1) { + opkg_perror(ERROR, "Could not create lock file %s", lock_file); + goto err2; + } - pkg_hash_init(); - hash_table_init("file-hash", &conf->file_hash, OPKG_CONF_DEFAULT_HASH_LEN); - hash_table_init("obs-file-hash", &conf->obs_file_hash, OPKG_CONF_DEFAULT_HASH_LEN/16); + if (lockf(lock_fd, F_TLOCK, (off_t)0) == -1) { + opkg_perror(ERROR, "Could not lock %s", lock_file); + 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->lists_dir == NULL) - conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR); + if (conf->tmp_dir) + tmp_dir_base = conf->tmp_dir; + else + tmp_dir_base = getenv("TMPDIR"); + + sprintf_alloc(&tmp, "%s/%s", + tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE, + OPKG_CONF_TMP_DIR_SUFFIX); + if (conf->tmp_dir) + free(conf->tmp_dir); + conf->tmp_dir = mkdtemp(tmp); + if (conf->tmp_dir == NULL) { + opkg_perror(ERROR, "Creating temp dir %s failed", tmp); + goto err3; + } - if (conf->offline_root) { - char *tmp; - sprintf_alloc(&tmp, "%s/%s", conf->offline_root, conf->lists_dir); - free(conf->lists_dir); - conf->lists_dir = tmp; - } + pkg_hash_init(); + hash_table_init("file-hash", &conf->file_hash, OPKG_CONF_DEFAULT_HASH_LEN); + hash_table_init("obs-file-hash", &conf->obs_file_hash, OPKG_CONF_DEFAULT_HASH_LEN/16); - /* if no architectures were defined, then default all, noarch, and host architecture */ - if (nv_pair_list_empty(&conf->arch_list)) { - nv_pair_list_append(&conf->arch_list, "all", "1"); - nv_pair_list_append(&conf->arch_list, "noarch", "1"); - nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10"); - } + if (conf->lists_dir == NULL) + conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR); - /* 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, - OPKG_CONF_DEFAULT_DEST_NAME, - OPKG_CONF_DEFAULT_DEST_ROOT_DIR); - } + if (conf->offline_root) { + sprintf_alloc(&tmp, "%s/%s", conf->offline_root, conf->lists_dir); + free(conf->lists_dir); + conf->lists_dir = tmp; + } - err = resolve_pkg_dest_list(&tmp_dest_nv_pair_list, args->dest); - nv_pair_list_deinit(&tmp_dest_nv_pair_list); + /* if no architectures were defined, then default all, noarch, and host architecture */ + if (nv_pair_list_empty(&conf->arch_list)) { + nv_pair_list_append(&conf->arch_list, "all", "1"); + nv_pair_list_append(&conf->arch_list, "noarch", "1"); + nv_pair_list_append(&conf->arch_list, HOST_CPU_STR, "10"); + } - if (err) - return -1; + /* Even if there is no conf file, we'll need at least one dest. */ + 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); + } - return 0; + if (resolve_pkg_dest_list()) + goto err4; + + nv_pair_list_deinit(&conf->tmp_dest_list); + + return 0; + + +err4: + free(conf->lists_dir); + + pkg_hash_deinit(); + hash_table_deinit(&conf->file_hash); + hash_table_deinit(&conf->obs_file_hash); + + if (rmdir(conf->tmp_dir) == -1) + opkg_perror(ERROR, "Couldn't remove dir %s", conf->tmp_dir); +err3: + 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 (unlink(lock_file) == -1) + opkg_perror(ERROR, "Couldn't unlink %s", lock_file); +err2: + 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); + nv_pair_list_deinit(&conf->arch_list); + + for (i=0; options[i].name; i++) { + if (options[i].type == OPKG_OPT_TYPE_STRING) { + tmp_val = (char **)options[i].value; + if (*tmp_val) { + free(*tmp_val); + *tmp_val = NULL; + } + } + } +err0: + nv_pair_list_deinit(&conf->tmp_dest_list); + if (conf->dest_str) + free(conf->dest_str); + if (conf->conf_file) + free(conf->conf_file); + + return -1; } void @@ -517,9 +604,17 @@ 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); + + if (conf->conf_file) + free(conf->conf_file); pkg_src_list_deinit(&conf->pkg_src_list); pkg_dest_list_deinit(&conf->pkg_dest_list); @@ -535,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); @@ -545,10 +640,20 @@ opkg_conf_deinit(void) hash_table_deinit(&conf->file_hash); hash_table_deinit(&conf->obs_file_hash); - /* lockf may be defined with warn_unused_result */ - if (lockf(lock_fd, F_ULOCK, (off_t)0) != 0) { - opkg_perror(ERROR, "unlock failed"); + 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); + } - close(lock_fd); + if (lock_file) { + if (unlink(lock_file) == -1) + opkg_perror(ERROR, "Couldn't unlink %s", lock_file); + + free(lock_file); + } }