{ "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 },
{
int err;
int errno_copy;
- char *tmp_dir_base;
+ char *tmp_dir_base, *tmp2;
nv_pair_list_t tmp_dest_nv_pair_list;
char *lock_file = NULL;
glob_t globbuf;
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)
}
free(lock_file);
- if (args->tmp_dir)
- tmp_dir_base = args->tmp_dir;
+ if (conf->tmp_dir)
+ tmp_dir_base = conf->tmp_dir;
else
tmp_dir_base = getenv("TMPDIR");
- sprintf_alloc(&conf->tmp_dir, "%s/%s",
+ sprintf_alloc(&tmp2, "%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)
+ 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",
- conf->tmp_dir, strerror(errno));
+ __FUNCTION__, tmp2, strerror(errno));
return OPKG_CONF_ERR_TMP_DIR;
}
conf->lists_dir = tmp;
}
- sprintf_alloc(&conf->pending_dir, "%s/pending", conf->lists_dir);
-
/* 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");
/* Pigi: added a flag to disable the checking of structures if the command does not need to
read anything from there.
*/
- if ( !(args->nocheckfordirorfile)){
- /* need to run load the source list before dest list -Jamey */
- if ( !(args->noreadfeedsfile))
- set_and_load_pkg_src_list(conf, &conf->pkg_src_list);
+ if (!(args->nocheckfordirorfile)) {
+
+ if (!(args->noreadfeedsfile)) {
+ if (set_and_load_pkg_src_list(conf, &conf->pkg_src_list)) {
+ nv_pair_list_deinit(&tmp_dest_nv_pair_list);
+ return -1;
+ }
+ }
/* 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);
+ if (set_and_load_pkg_dest_list(conf, &tmp_dest_nv_pair_list)) {
+ nv_pair_list_deinit(&tmp_dest_nv_pair_list);
+ return -1;
+ }
if (args->dest) {
err = opkg_conf_set_default_dest(conf, args->dest);
if (err) {
+ nv_pair_list_deinit(&tmp_dest_nv_pair_list);
return OPKG_CONF_ERR_DEFAULT_DEST;
}
}
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);
return 1;
}
-static int set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_list)
+static int
+set_and_load_pkg_src_list(opkg_conf_t *conf, pkg_src_list_t *pkg_src_list)
{
pkg_src_list_elt_t *iter;
pkg_src_t *src;
src->name);
if (file_exists(list_file)) {
- pkg_hash_add_from_file(conf, list_file, src, NULL, 0);
+ if (pkg_hash_add_from_file(conf, list_file, src, NULL, 0)) {
+ free(list_file);
+ return -1;
+ }
}
free(list_file);
}
return 0;
}
-static int set_and_load_pkg_dest_list(opkg_conf_t *conf, nv_pair_list_t *nv_pair_list)
+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;
conf->default_dest = dest;
}
if (file_exists(dest->status_file_name)) {
- pkg_hash_add_from_file(conf, dest->status_file_name,
- NULL, dest, 1);
+ if (pkg_hash_add_from_file(conf, dest->status_file_name,
+ NULL, dest, 1))
+ return -1;
}
}
break;
}
- str_chomp(line);
-
if (regexec(&comment_re, line, 0, 0, 0) == 0) {
goto NEXT_LINE;
}
if (regexec(&valid_line_re, line, regmatch_size, regmatch, 0) == REG_NOMATCH) {
- str_chomp(line);
fprintf(stderr, "%s:%d: Ignoring invalid line: `%s'\n",
filename, line_num, line);
goto NEXT_LINE;