3 @@ -592,49 +592,8 @@ opkg_update_package_lists(opkg_progress_
4 src->gzip ? "Packages.gz" : "Packages");
6 sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
9 - struct _curl_cb_data cb_data;
10 - char *tmp_file_name = NULL;
12 - sprintf_alloc(&tmp_file_name, "%s/%s.gz", tmp,
15 - opkg_msg(INFO, "Downloading %s to %s...\n", url,
18 - cb_data.cb = progress_callback;
19 - cb_data.progress_data = &pdata;
20 - cb_data.user_data = user_data;
21 - cb_data.start_range =
22 - 100 * sources_done / sources_list_count;
23 - cb_data.finish_range =
24 - 100 * (sources_done + 1) / sources_list_count;
26 - err = opkg_download(url, tmp_file_name,
27 - (curl_progress_func) curl_progress_cb,
31 - opkg_msg(INFO, "Inflating %s...\n",
33 - in = fopen(tmp_file_name, "r");
34 - out = fopen(list_file_name, "w");
43 - unlink(tmp_file_name);
45 - free(tmp_file_name);
47 - err = opkg_download(url, list_file_name, NULL, NULL, 0);
50 + if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
51 opkg_msg(ERROR, "Couldn't retrieve %s\n", url);
54 --- a/libopkg/opkg_cmd.c
55 +++ b/libopkg/opkg_cmd.c
56 @@ -162,30 +162,7 @@ opkg_update_cmd(int argc, char **argv)
57 sprintf_alloc(&url, "%s/%s", src->value, src->gzip ? "Packages.gz" : "Packages");
59 sprintf_alloc(&list_file_name, "%s/%s", lists_dir, src->name);
61 - char *tmp_file_name;
64 - sprintf_alloc (&tmp_file_name, "%s/%s.gz", tmp, src->name);
65 - err = opkg_download(url, tmp_file_name, NULL, NULL, 0);
67 - opkg_msg(NOTICE, "Inflating %s.\n", url);
68 - in = fopen (tmp_file_name, "r");
69 - out = fopen (list_file_name, "w");
78 - unlink (tmp_file_name);
80 - free(tmp_file_name);
82 - err = opkg_download(url, list_file_name, NULL, NULL, 0);
84 + if (opkg_download(url, list_file_name, NULL, NULL, 0)) {
87 opkg_msg(NOTICE, "Updated list of available packages in %s.\n",
88 --- a/libopkg/pkg_hash.c
89 +++ b/libopkg/pkg_hash.c
90 @@ -102,12 +102,18 @@ pkg_hash_add_from_file(const char *file_
91 pkg_src_t *src, pkg_dest_t *dest, int is_status_file)
95 + FILE *fp, *fp_c = NULL;
97 const size_t len = 4096;
101 fp = fopen(file_name, "r");
102 + if (fp && src && src->gzip) {
104 + fp = gz_open(fp_c, &pid);
108 opkg_perror(ERROR, "Failed to open %s", file_name);
110 @@ -154,6 +160,10 @@ pkg_hash_add_from_file(const char *file_