emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

status_package_num should refer to package not status.

Browse Source 
Only initialise a new entry in the status hashtable if it really is a new entry.
This commit is contained in:
Glenn L McGrath 2001-10-06 02:27:36 +00:00
parent 3550753445
commit f28d819554
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
archival/dpkg.c
View File

@ -1262,7 +1262,7 @@ void unpack_package(deb_file_t *deb_file)
{ {
const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
const unsigned int status_num = search_status_hashtable(package_name); const unsigned int status_num = search_status_hashtable(package_name);
const unsigned int status_package_num = status_hashtable[status_num]->status; const unsigned int status_package_num = status_hashtable[status_num]->package;
FILE *out_stream; FILE *out_stream;
char *info_prefix; char *info_prefix;
@ -1413,15 +1413,16 @@ extern int dpkg_main(int argc, char **argv)
/* Try and find a currently installed version of this package */ /* Try and find a currently installed version of this package */
status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[deb_count]->package]->name]); status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[deb_count]->package]->name]);
/* If no previous entry was found initialise a new entry */
if ((status_hashtable[status_num] == NULL) || if ((status_hashtable[status_num] == NULL) ||
(status_hashtable[status_num]->status == 0)) { (status_hashtable[status_num]->status == 0)) {
/* reinstreq isnt changed to "ok" until the package control info /* reinstreq isnt changed to "ok" until the package control info
* is written to the status file*/ * is written to the status file*/
status_node->status = search_name_hashtable("install reinstreq not-installed"); status_node->status = search_name_hashtable("install reinstreq not-installed");
}
status_hashtable[status_num] = status_node; status_hashtable[status_num] = status_node;
} }
} }
}
else if (dpkg_opt & dpkg_opt_package_name) { else if (dpkg_opt & dpkg_opt_package_name) {
deb_file[deb_count]->filename = NULL; deb_file[deb_count]->filename = NULL;
deb_file[deb_count]->control_file = NULL; deb_file[deb_count]->control_file = NULL;

5
dpkg.c
View File

@ -1262,7 +1262,7 @@ void unpack_package(deb_file_t *deb_file)
{ {
const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name]; const char *package_name = name_hashtable[package_hashtable[deb_file->package]->name];
const unsigned int status_num = search_status_hashtable(package_name); const unsigned int status_num = search_status_hashtable(package_name);
const unsigned int status_package_num = status_hashtable[status_num]->status; const unsigned int status_package_num = status_hashtable[status_num]->package;
FILE *out_stream; FILE *out_stream;
char *info_prefix; char *info_prefix;
@ -1413,15 +1413,16 @@ extern int dpkg_main(int argc, char **argv)
/* Try and find a currently installed version of this package */ /* Try and find a currently installed version of this package */
status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[deb_count]->package]->name]); status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[deb_count]->package]->name]);
/* If no previous entry was found initialise a new entry */
if ((status_hashtable[status_num] == NULL) || if ((status_hashtable[status_num] == NULL) ||
(status_hashtable[status_num]->status == 0)) { (status_hashtable[status_num]->status == 0)) {
/* reinstreq isnt changed to "ok" until the package control info /* reinstreq isnt changed to "ok" until the package control info
* is written to the status file*/ * is written to the status file*/
status_node->status = search_name_hashtable("install reinstreq not-installed"); status_node->status = search_name_hashtable("install reinstreq not-installed");
}
status_hashtable[status_num] = status_node; status_hashtable[status_num] = status_node;
} }
} }
}
else if (dpkg_opt & dpkg_opt_package_name) { else if (dpkg_opt & dpkg_opt_package_name) {
deb_file[deb_count]->filename = NULL; deb_file[deb_count]->filename = NULL;
deb_file[deb_count]->control_file = NULL; deb_file[deb_count]->control_file = NULL;