#include "opkg_message.h"
#include "file_util.h"
#include "str_util.h"
-#include "xsystem.h"
#include "opkg_defines.h"
#include "libbb/libbb.h"
#include <errno.h>
#include <glob.h>
-extern char *conf_file_dir;
-
static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
pkg_src_list_t *pkg_src_list,
- nv_pair_list_t *tmp_dest_nv_pair_list,
- char **tmp_lists_dir);
+ nv_pair_list_t *tmp_dest_nv_pair_list);
static int opkg_conf_set_option(const opkg_option_t *options,
const char *name, const char *value);
static int opkg_conf_set_default_dest(opkg_conf_t *conf,
static int set_and_load_pkg_src_list(opkg_conf_t *conf,
pkg_src_list_t *nv_pair_list);
static int set_and_load_pkg_dest_list(opkg_conf_t *conf,
- nv_pair_list_t *nv_pair_list, char * lists_dir);
+ nv_pair_list_t *nv_pair_list);
-int opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
+void opkg_init_options_array(const opkg_conf_t *conf, opkg_option_t **options)
{
opkg_option_t tmp[] = {
{ "cache", OPKG_OPT_TYPE_STRING, &conf->cache},
{ "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 },
+ { "tmp_dir", OPKG_OPT_TYPE_STRING, &conf->tmp_dir },
{ "verbosity", OPKG_OPT_TYPE_BOOL, &conf->verbosity },
#if defined(HAVE_OPENSSL)
{ "signature_ca_file", OPKG_OPT_TYPE_STRING, &conf->signature_ca_file },
{ "signature_ca_path", OPKG_OPT_TYPE_STRING, &conf->signature_ca_path },
#endif
+#if defined(HAVE_PATHFINDER)
+ { "check_x509_path", OPKG_OPT_TYPE_INT, &conf->check_x509_path },
+#endif
#if defined(HAVE_SSLCURL) && defined(HAVE_CURL)
{ "ssl_engine", OPKG_OPT_TYPE_STRING, &conf->ssl_engine },
{ "ssl_cert", OPKG_OPT_TYPE_STRING, &conf->ssl_cert },
{ NULL }
};
- *options = (opkg_option_t *)calloc(1, sizeof(tmp));
- if ( options == NULL ){
- fprintf(stderr,"%s: Unable to allocate memory\n",__FUNCTION__);
- return -1;
- }
-
+ *options = xcalloc(1, sizeof(tmp));
memcpy(*options, tmp, sizeof(tmp));
- return 0;
};
static void opkg_conf_override_string(char **conf_str, char *arg_str)
{
int err;
int errno_copy;
- char *tmp_dir_base;
+ char *tmp_dir_base, *tmp2;
nv_pair_list_t tmp_dest_nv_pair_list;
- char *lists_dir = NULL, *lock_file = NULL;
+ char *lock_file = NULL;
glob_t globbuf;
char *etc_opkg_conf_pattern;
- char *pending_dir = NULL;
+ char *offline_root = NULL;
memset(conf, 0, sizeof(opkg_conf_t));
+#if defined(HAVE_PATHFINDER)
+ conf->check_x509_path = 1;
+#endif
+
pkg_src_list_init(&conf->pkg_src_list);
nv_pair_list_init(&tmp_dest_nv_pair_list);
conf->restrict_to_default_dest = 0;
conf->default_dest = NULL;
- /* check for lock file */
- if (args->offline_root)
- sprintf_alloc (&lock_file, "%s/%s/lock", args->offline_root, OPKG_STATE_DIR_PREFIX);
- else
- sprintf_alloc (&lock_file, "%s/lock", OPKG_STATE_DIR_PREFIX);
-
- conf->lock_fd = creat (lock_file, S_IRUSR | S_IWUSR | S_IRGRP);
- err = lockf (conf->lock_fd, F_TLOCK, 0);
- errno_copy = errno;
-
- free (lock_file);
-
- if (err)
- {
- if(args->offline_root) {
- opkg_message (conf, OPKG_ERROR, "Could not obtain administrative lock for offline root (ERR: %s) at %s/%s/lock\n",
- strerror(errno_copy), args->offline_root, OPKG_STATE_DIR_PREFIX);
- } else {
- opkg_message (conf, OPKG_ERROR, "Could not obtain administrative lock (ERR: %s) at %s/lock\n",
- strerror(errno_copy), OPKG_STATE_DIR_PREFIX);
- }
- return OPKG_CONF_ERR_LOCK;
- }
-
- if (args->tmp_dir)
- tmp_dir_base = args->tmp_dir;
- else
- tmp_dir_base = getenv("TMPDIR");
- sprintf_alloc(&conf->tmp_dir, "%s/%s",
- tmp_dir_base ? tmp_dir_base : OPKG_CONF_DEFAULT_TMP_DIR_BASE,
- OPKG_CONF_TMP_DIR_SUFFIX);
- conf->tmp_dir = mkdtemp(conf->tmp_dir);
- if (conf->tmp_dir == NULL) {
- fprintf(stderr, "%s: Failed to create temporary directory `%s': %s\n",
- __FUNCTION__, conf->tmp_dir, strerror(errno));
- return OPKG_CONF_ERR_TMP_DIR;
- }
-
- pkg_hash_init("pkg-hash", &conf->pkg_hash, OPKG_CONF_DEFAULT_HASH_LEN);
- 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);
- lists_dir=(char *)malloc(1);
- lists_dir[0]='\0';
if (args->conf_file) {
struct stat stat_buf;
err = stat(args->conf_file, &stat_buf);
if (err == 0)
if (opkg_conf_parse_file(conf, args->conf_file,
- &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
+ &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
/* Memory leakage from opkg_conf_parse-file */
return OPKG_CONF_ERR_PARSE;
}
}
- if (strlen(lists_dir)<=1 ){
- lists_dir = realloc(lists_dir,strlen(OPKG_CONF_LISTS_DIR)+2);
- sprintf (lists_dir,"%s",OPKG_CONF_LISTS_DIR);
- }
+ opkg_conf_override_string(&conf->offline_root, args->offline_root);
+ offline_root = conf->offline_root;
- if (args->offline_root) {
- char *tmp;
- sprintf_alloc(&tmp, "%s/%s",args->offline_root,lists_dir);
- free(lists_dir);
- lists_dir = tmp;
- }
-
- pending_dir = calloc(1, strlen(lists_dir)+strlen("/pending")+5);
- snprintf(pending_dir,strlen(lists_dir)+strlen("/pending") ,"%s%s",lists_dir,"/pending");
-
- conf->lists_dir = xstrdup(lists_dir);
- conf->pending_dir = xstrdup(pending_dir);
-
- if (args->offline_root)
- sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", args->offline_root);
- else
+ if (conf->offline_root)
+ sprintf_alloc(&etc_opkg_conf_pattern, "%s/etc/opkg/*.conf", conf->offline_root);
+ else {
+ 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);
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(conf, globbuf.gl_pathv[i],
- &conf->pkg_src_list, &tmp_dest_nv_pair_list,&lists_dir)<0) {
+ &conf->pkg_src_list, &tmp_dest_nv_pair_list)<0) {
/* Memory leakage from opkg_conf_parse-file */
return OPKG_CONF_ERR_PARSE;
}
+ if (offline_root != conf->offline_root) {
+ opkg_message(conf, OPKG_ERROR,
+ "Config file %s, within an offline "
+ "root contains option offline_root.\n",
+ globbuf.gl_pathv[i]);
+ return OPKG_CONF_ERR_PARSE;
+ }
}
}
globfree(&globbuf);
+ opkg_conf_override_string(&conf->offline_root_path,
+ args->offline_root_path);
+ opkg_conf_override_string(&conf->offline_root_pre_script_cmd,
+ args->offline_root_pre_script_cmd);
+ opkg_conf_override_string(&conf->offline_root_post_script_cmd,
+ args->offline_root_post_script_cmd);
+
+ opkg_conf_override_string(&conf->cache, args->cache);
+ opkg_conf_override_string(&conf->tmp_dir, args->tmp_dir);
+
+ /* 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);
+
+ err = conf->lock_fd = creat (lock_file, S_IRUSR | S_IWUSR | S_IRGRP);
+ if (err != -1)
+ err = lockf (conf->lock_fd, F_TLOCK, 0);
+ errno_copy = errno;
+
+ if (err) {
+ opkg_message (conf, OPKG_ERROR, "Could not lock %s: %s\n",
+ lock_file, strerror(errno_copy));
+ free(lock_file);
+ return OPKG_CONF_ERR_LOCK;
+ }
+ 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_message(conf, OPKG_ERROR,
+ "%s: Creating temp dir %s failed: %s\n",
+ __FUNCTION__, tmp2, strerror(errno));
+ return OPKG_CONF_ERR_TMP_DIR;
+ }
+
+ pkg_hash_init("pkg-hash", &conf->pkg_hash, OPKG_CONF_DEFAULT_HASH_LEN);
+ 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 (conf->lists_dir == NULL)
+ conf->lists_dir = xstrdup(OPKG_CONF_LISTS_DIR);
+
+ 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;
+ }
+
/* 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");
conf->verbosity = args->verbosity;
}
- opkg_conf_override_string(&conf->offline_root,
- args->offline_root);
- opkg_conf_override_string(&conf->offline_root_path,
- args->offline_root_path);
- opkg_conf_override_string(&conf->offline_root_pre_script_cmd,
- args->offline_root_pre_script_cmd);
- opkg_conf_override_string(&conf->offline_root_post_script_cmd,
- args->offline_root_post_script_cmd);
-
- opkg_conf_override_string(&conf->cache, args->cache);
-
/* Pigi: added a flag to disable the checking of structures if the command does not need to
read anything from there.
*/
/* Now that we have resolved conf->offline_root, we can commit to
the directory names for the dests and load in all the package
lists. */
- set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list,lists_dir);
+ set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list);
if (args->dest) {
err = opkg_conf_set_default_dest(conf, args->dest);
}
}
nv_pair_list_deinit(&tmp_dest_nv_pair_list);
- free(lists_dir);
- free(pending_dir);
return 0;
}
void opkg_conf_deinit(opkg_conf_t *conf)
{
-#ifdef OPKG_DEBUG_NO_TMP_CLEANUP
-#error
- fprintf(stderr, "%s: Not cleaning up %s since opkg compiled "
- "with OPKG_DEBUG_NO_TMP_CLEANUP\n",
- __FUNCTION__, conf->tmp_dir);
-#else
- int err;
+ rm_r(conf->tmp_dir);
- err = rmdir(conf->tmp_dir);
- if (err) {
- if (errno == ENOTEMPTY) {
- char *cmd;
- sprintf_alloc(&cmd, "rm -fr %s\n", conf->tmp_dir);
- err = xsystem(cmd);
- free(cmd);
- }
- if (err)
- fprintf(stderr, "WARNING: Unable to remove temporary directory: %s: %s\n", conf->tmp_dir, strerror(errno));
- }
-#endif /* OPKG_DEBUG_NO_TMP_CLEANUP */
-
- free(conf->tmp_dir); /*XXX*/
+ free(conf->tmp_dir);
free(conf->lists_dir);
- free(conf->pending_dir);
pkg_src_list_deinit(&conf->pkg_src_list);
pkg_dest_list_deinit(&conf->pkg_dest_list);
nv_pair_list_deinit(&conf->arch_list);
- if (&conf->pkg_hash)
- pkg_hash_deinit(&conf->pkg_hash);
- if (&conf->file_hash)
- hash_table_deinit(&conf->file_hash);
- if (&conf->obs_file_hash)
- hash_table_deinit(&conf->obs_file_hash);
+
+ opkg_conf_free_string(&conf->cache);
+
+ opkg_conf_free_string(&conf->ftp_proxy);
+ opkg_conf_free_string(&conf->http_proxy);
+ opkg_conf_free_string(&conf->no_proxy);
opkg_conf_free_string(&conf->offline_root);
opkg_conf_free_string(&conf->offline_root_path);
opkg_conf_free_string(&conf->offline_root_pre_script_cmd);
opkg_conf_free_string(&conf->offline_root_post_script_cmd);
- opkg_conf_free_string(&conf->cache);
+ opkg_conf_free_string(&conf->proxy_passwd);
+ opkg_conf_free_string(&conf->proxy_user);
#if defined(HAVE_OPENSSL)
opkg_conf_free_string(&conf->signature_ca_file);
opkg_conf_free_string(&conf->ssl_ca_path);
#endif
- if (conf->verbosity > 1) {
- int i;
- hash_table_t *hashes[] = {
- &conf->pkg_hash,
- &conf->file_hash,
- &conf->obs_file_hash };
- for (i = 0; i < 3; i++) {
- hash_table_t *hash = hashes[i];
- int c = 0;
- int n_conflicts = 0;
- int j;
- for (j = 0; j < hash->n_entries; j++) {
- int len = 0;
- hash_entry_t *e = &hash->entries[j];
- if (e->next)
- n_conflicts++;
- while (e && e->key) {
- len++;
- e = e->next;
- }
- if (len > c)
- c = len;
- }
- opkg_message(conf, OPKG_DEBUG, "hash_table[%s] n_buckets=%d n_elements=%d max_conflicts=%d n_conflicts=%d\n",
- hash->name, hash->n_entries, hash->n_elements, c, n_conflicts);
- hash_table_deinit(hash);
- }
+ if (conf->verbosity >= OPKG_DEBUG) {
+ hash_print_stats(&conf->pkg_hash);
+ hash_print_stats(&conf->file_hash);
+ hash_print_stats(&conf->obs_file_hash);
+ }
+
+ if (&conf->pkg_hash)
+ pkg_hash_deinit(&conf->pkg_hash);
+ if (&conf->file_hash)
+ hash_table_deinit(&conf->file_hash);
+ if (&conf->obs_file_hash)
+ hash_table_deinit(&conf->obs_file_hash);
+
+ /* lockf maybe defined with warn_unused_result */
+ if(lockf(conf->lock_fd, F_ULOCK, 0) != 0){
+ opkg_message(conf, OPKG_DEBUG, "%s: unlock failed: %s\n",
+ __FUNCTION__,
+ strerror(errno));
}
+ close(conf->lock_fd);
}
static int opkg_conf_set_default_dest(opkg_conf_t *conf,
return 0;
}
-static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list, char *lists_dir )
+static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list)
{
nv_pair_list_elt_t *iter;
nv_pair_t *nv_pair;
} else {
root_dir = xstrdup(nv_pair->value);
}
- dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, lists_dir);
+ dest = pkg_dest_list_append(&conf->pkg_dest_list, nv_pair->name, root_dir, conf->lists_dir);
free(root_dir);
if (dest == NULL) {
continue;
static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
pkg_src_list_t *pkg_src_list,
- nv_pair_list_t *tmp_dest_nv_pair_list,
- char **lists_dir)
+ nv_pair_list_t *tmp_dest_nv_pair_list)
{
int err;
opkg_option_t * options;
- FILE *file = fopen(filename, "r");
+ FILE *file;
regex_t valid_line_re, comment_re;
#define regmatch_size 12
regmatch_t regmatch[regmatch_size];
- if (opkg_init_options_array(conf, &options)<0)
- return ENOMEM;
+ opkg_init_options_array(conf, &options);
+ file = fopen(filename, "r");
if (file == NULL) {
fprintf(stderr, "%s: failed to open %s: %s\n",
__FUNCTION__, filename, strerror(errno));
free(options);
- return errno;
+ return -1;
}
opkg_message(conf, OPKG_NOTICE, "loading conf file %s\n", filename);
REG_EXTENDED);
if (err) {
free(options);
- return err;
+ return -1;
}
err = xregcomp(&valid_line_re, "^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))([[:space:]]+([^[:space:]]+))?[[:space:]]*$", REG_EXTENDED);
if (err) {
free(options);
- return err;
+ return -1;
}
while(1) {
} else if (strcmp(type, "dest") == 0) {
nv_pair_list_append(tmp_dest_nv_pair_list, name, value);
} else if (strcmp(type, "lists_dir") == 0) {
- *lists_dir = realloc(*lists_dir,strlen(value)+1);
- if (*lists_dir == NULL) {
- opkg_message(conf, OPKG_ERROR, "ERROR: Not enough memory\n");
- free(options);
- return EINVAL;
- }
- sprintf (*lists_dir,"%s",value);
+ conf->lists_dir = xstrdup(value);
} else if (strcmp(type, "arch") == 0) {
opkg_message(conf, OPKG_INFO, "supported arch %s priority (%s)\n", name, value);
if (!value) {
fprintf(stderr, "WARNING: Ignoring unknown configuration "
"parameter: %s %s %s\n", type, name, value);
free(options);
- return EINVAL;
+ return -1;
}
free(type);
int opkg_conf_write_status_files(opkg_conf_t *conf)
{
+ pkg_dest_list_elt_t *iter;
pkg_dest_t *dest;
pkg_vec_t *all;
pkg_t *pkg;
- int i;
- int err;
- FILE * status_file=NULL;
+ int i, ret = 0;
if (conf->noaction)
return 0;
- dest = (pkg_dest_t *)void_list_first(&conf->pkg_dest_list)->data;
- status_file = fopen(dest->status_file_tmp_name, "w");
- if (status_file == NULL) {
- fprintf(stderr, "%s: Can't open status file: %s for writing: %s\n",
- __FUNCTION__, dest->status_file_tmp_name, strerror(errno));
+ list_for_each_entry(iter, &conf->pkg_dest_list.head, node) {
+ dest = (pkg_dest_t *)iter->data;
+
+ dest->status_fp = fopen(dest->status_file_name, "w");
+ if (dest->status_fp == NULL) {
+ fprintf(stderr, "%s: Can't open status file: %s: %s\n",
+ __FUNCTION__, dest->status_file_name, strerror(errno));
+ ret = -1;
+ }
}
all = pkg_vec_alloc();
__FUNCTION__, pkg->name);
continue;
}
- if (status_file) {
- pkg_print_status(pkg, status_file);
- }
+ if (pkg->dest->status_fp)
+ pkg_print_status(pkg, pkg->dest->status_fp);
}
pkg_vec_free(all);
- if (status_file) {
- err = ferror(status_file);
- fclose(status_file);
- if (!err) {
- file_move(dest->status_file_tmp_name, dest->status_file_name);
- } else {
- fprintf(stderr, "%s: ERROR: An error has occurred writing %s, "
- "retaining old %s\n", __FUNCTION__,
- dest->status_file_tmp_name, dest->status_file_name);
- }
- status_file = NULL;
+ list_for_each_entry(iter, &conf->pkg_dest_list.head, node) {
+ dest = (pkg_dest_t *)iter->data;
+ fclose(dest->status_fp);
}
- return 0;
+
+ return ret;
}
projects / oweals / opkg-lede.git / blobdiff