{ "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 },
};
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) {
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");
"^[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
"[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
"[[:space:]]*(\"([^\"]*)\"|([^[:space:]]*))"
- "([[:space:]]+([^[:space:]]+))?[[:space:]]*$",
+ "([[:space:]]+([^[:space:]]+))?([[:space:]]+(.*))?[[:space:]]*$",
REG_EXTENDED);
if (err)
goto err2;
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
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);
"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) {
filename, line_num, line);
}
+ }
+
free(type);
free(name);
free(value);
int
opkg_conf_init(void)
+{
+ 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;
glob_t globbuf;
char *etc_opkg_conf_pattern;
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"));
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;
}
!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) {
+ &conf->pkg_src_list, &conf->dist_src_list)<0) {
globfree(&globbuf);
goto err1;
}
if (close(lock_fd) == -1)
opkg_perror(ERROR, "Couldn't close descriptor %d (%s)",
lock_fd, lock_file);
+ lock_fd = -1;
goto err2;
}
}
/* 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))
+ 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;
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);
}
}
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)
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);
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);
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);
+ }
}
projects / oweals / opkg-lede.git / blobdiff