static int
opkg_conf_parse_file(const char *filename,
- pkg_src_list_t * pkg_src_list,
- pkg_src_list_t * dist_src_list)
+ pkg_src_list_t * pkg_src_list)
{
int line_num = 0;
int err = 0;
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)) {
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);
goto err0;
}
if (opkg_conf_parse_file(conf->conf_file,
- &conf->pkg_src_list,
- &conf->dist_src_list))
+ &conf->pkg_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,
- &conf->dist_src_list) < 0) {
+ &conf->pkg_src_list) < 0) {
globfree(&globbuf);
goto err1;
}
}
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);
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->pkg_hash);
}
-int dist_hash_add_from_file(const char *lists_dir, pkg_src_t * dist)
-{
- nv_pair_list_elt_t *l;
- char *list_file, *subname;
-
- list_for_each_entry(l, &conf->arch_list.head, node) {
- nv_pair_t *nv = (nv_pair_t *) l->data;
- sprintf_alloc(&subname, "%s-%s", dist->name, nv->name);
- sprintf_alloc(&list_file, "%s/%s", lists_dir, subname);
-
- if (file_exists(list_file)) {
- if (pkg_hash_add_from_file(list_file, dist, NULL, 0, 0, NULL, NULL)) {
- free(list_file);
- return -1;
- }
- pkg_src_list_append(&conf->pkg_src_list, subname,
- dist->value, "__dummy__", 0);
- }
-
- free(list_file);
- }
-
- return 0;
-}
-
int
pkg_hash_add_from_file(const char *file_name,
pkg_src_t * src, pkg_dest_t * dest, int is_status_file, int state_flags,
void pkg_hash_fetch_available(pkg_vec_t * available);
-int dist_hash_add_from_file(const char *file_name, pkg_src_t * dist);
int pkg_hash_add_from_file(const char *file_name, pkg_src_t * src,
pkg_dest_t * dest, int is_status_file, int state_flags,
void (*cb)(pkg_t *, void *), void *priv);