* I estimate it should be at least 50% bigger than PACKAGE_HASH_PRIME,
* as there a lot of duplicate version numbers */
#define NAME_HASH_PRIME 16381
-static char *name_hashtable[NAME_HASH_PRIME + 1];
/* PACKAGE_HASH_PRIME, Maximum number of unique packages,
* It must not be smaller than STATUS_HASH_PRIME,
unsigned int num_of_edges:14;
edge_t **edge;
} common_node_t;
-static common_node_t *package_hashtable[PACKAGE_HASH_PRIME + 1];
/* Currently it doesnt store packages that have state-status of not-installed
* So it only really has to be the size of the maximum number of packages
unsigned int package:14; /* has to fit PACKAGE_HASH_PRIME */
unsigned int status:14; /* has to fit STATUS_HASH_PRIME */
} status_node_t;
-static status_node_t *status_hashtable[STATUS_HASH_PRIME + 1];
+
+/* Were statically declared here, but such a big bss is nommu-unfriendly */
+static char **name_hashtable; /* [NAME_HASH_PRIME + 1] */
+static common_node_t **package_hashtable; /* [PACKAGE_HASH_PRIME + 1] */
+static status_node_t **status_hashtable; /* [STATUS_HASH_PRIME + 1] */
/* Even numbers are for 'extras', like ored dependencies or null */
enum edge_type_e {
/* Maybe i should have uses a "proper" hashing algorithm here instead
* of making one up myself, seems to be working ok though. */
- for(i = 1; i < len; i++) {
+ for (i = 1; i < len; i++) {
/* shifts the ascii based value and adds it to previous value
* shift amount is mod 24 because long int is 32 bit and data
* to be shifted is 8, don't want to shift data to where it has
// char *temp;
make_hash(key, &probe_address, &probe_decrement, NAME_HASH_PRIME);
- while(name_hashtable[probe_address] != NULL) {
+ while (name_hashtable[probe_address] != NULL) {
if (strcmp(name_hashtable[probe_address], key) == 0) {
- return(probe_address);
+ return probe_address;
} else {
probe_address -= probe_decrement;
if ((int)probe_address < 0) {
}
}
name_hashtable[probe_address] = xstrdup(key);
- return(probe_address);
+ return probe_address;
}
/* this DOESNT add the key to the hashtable
unsigned int probe_decrement = 0;
make_hash(key, &probe_address, &probe_decrement, STATUS_HASH_PRIME);
- while(status_hashtable[probe_address] != NULL) {
+ while (status_hashtable[probe_address] != NULL) {
if (strcmp(key, name_hashtable[package_hashtable[status_hashtable[probe_address]->package]->name]) == 0) {
break;
} else {
}
}
}
- return(probe_address);
+ return probe_address;
}
/* Need to rethink version comparison, maybe the official dpkg has something i can use ? */
}
ret = 0;
cleanup_version_compare_part:
- return(ret);
+ return ret;
}
/* if ver1 < ver2 return -1,
ver2_ptr = ch_ver2;
}
if (epoch1 < epoch2) {
- return(-1);
+ return -1;
}
else if (epoch1 > epoch2) {
- return(1);
+ return 1;
}
/* Compare upstream version */
deb_ver2++;
}
result = version_compare_part(upstream_ver1, upstream_ver2);
+ if (!result)
+ /* Compare debian versions */
+ result = version_compare_part(deb_ver1, deb_ver2);
free(upstream_ver1);
free(upstream_ver2);
-
- if (result != 0) {
- return(result);
- }
-
- /* Compare debian versions */
- return(version_compare_part(deb_ver1, deb_ver2));
+ return result;
}
static int test_version(const unsigned int version1, const unsigned int version2, const unsigned int operator)
{
const int version_result = version_compare(version1, version2);
- switch(operator) {
- case (VER_ANY):
- return(TRUE);
- case (VER_EQUAL):
+ switch (operator) {
+ case VER_ANY:
+ return TRUE;
+ case VER_EQUAL:
if (version_result == 0) {
- return(TRUE);
+ return TRUE;
}
break;
- case (VER_LESS):
+ case VER_LESS:
if (version_result < 0) {
- return(TRUE);
+ return TRUE;
}
break;
- case (VER_LESS_EQUAL):
+ case VER_LESS_EQUAL:
if (version_result <= 0) {
- return(TRUE);
+ return TRUE;
}
break;
- case (VER_MORE):
+ case VER_MORE:
if (version_result > 0) {
- return(TRUE);
+ return TRUE;
}
break;
- case (VER_MORE_EQUAL):
+ case VER_MORE_EQUAL:
if (version_result >= 0) {
- return(TRUE);
+ return TRUE;
}
break;
}
- return(FALSE);
+ return FALSE;
}
unsigned int probe_decrement = 0;
make_hash(name_hashtable[name], &probe_address, &probe_decrement, PACKAGE_HASH_PRIME);
- while(package_hashtable[probe_address] != NULL) {
+ while (package_hashtable[probe_address] != NULL) {
if (package_hashtable[probe_address]->name == name) {
if (operator == VER_ANY) {
- return(probe_address);
+ return probe_address;
}
if (test_version(package_hashtable[probe_address]->version, version, operator)) {
- return(probe_address);
+ return probe_address;
}
}
probe_address -= probe_decrement;
probe_address += PACKAGE_HASH_PRIME;
}
}
- return(probe_address);
+ return probe_address;
}
/*
common_node_t *p;
for (i = start_at + 1; i < PACKAGE_HASH_PRIME; i++) {
p = package_hashtable[i];
- if ( p == NULL ) continue;
- for(j = 0; j < p->num_of_edges; j++)
- if ( p->edge[j]->type == EDGE_PROVIDES && p->edge[j]->name == needle )
+ if (p == NULL) continue;
+ for (j = 0; j < p->num_of_edges; j++)
+ if (p->edge[j]->type == EDGE_PROVIDES && p->edge[j]->name == needle)
return i;
}
return -1;
field += strspn(field, " ");
line2 = xstrdup(field);
field2 = strtok_r(line2, "|", &line_ptr2);
- if ( (edge_type == EDGE_DEPENDS || edge_type == EDGE_PRE_DEPENDS) &&
- (strcmp(field, field2) != 0)) {
+ if ((edge_type == EDGE_DEPENDS || edge_type == EDGE_PRE_DEPENDS) &&
+ (strcmp(field, field2) != 0)) {
or_edge = (edge_t *)xmalloc(sizeof(edge_t));
or_edge->type = edge_type + 1;
} else {
or_edge = NULL;
}
- if ( or_edge ) {
+ if (or_edge) {
or_edge->name = search_name_hashtable(field);
or_edge->version = 0; // tracks the number of altenatives
else if (strncmp(version, ">=", offset_ch) == 0) {
edge->operator = VER_MORE_EQUAL;
} else {
- bb_error_msg_and_die("Illegal operator");
+ bb_error_msg_and_die("illegal operator");
}
}
/* skip to start of version numbers */
field2[strcspn(field2, " (")] = '\0';
edge->name = search_name_hashtable(field2);
- if ( or_edge )
+ if (or_edge)
or_edge->version++;
add_edge_to_node(parent_node, edge);
static void free_package(common_node_t *node)
{
- unsigned short i;
+ unsigned i;
if (node) {
for (i = 0; i < node->num_of_edges; i++) {
free(node->edge[i]);
if (package_buffer == NULL) {
*field_name = NULL;
*field_value = NULL;
- return(-1);
+ return -1;
}
while (1) {
next_offset = offset + 1;
switch (package_buffer[offset]) {
- case('\0'):
+ case '\0':
exit_flag = TRUE;
break;
- case(':'):
+ case ':':
if (offset_name_end == 0) {
offset_name_end = offset;
offset_value_start = next_offset;
/* TODO: Name might still have trailing spaces if ':' isnt
* immediately after name */
break;
- case('\n'):
+ case '\n':
/* TODO: The char next_offset may be out of bounds */
if (package_buffer[next_offset] != ' ') {
exit_flag = TRUE;
break;
}
- case('\t'):
- case(' '):
+ case '\t':
+ case ' ':
/* increment the value start point if its a just filler */
if (offset_name_start == offset) {
offset_name_start++;
} else {
*field_value = NULL;
}
- return(next_offset);
+ return next_offset;
}
static unsigned int fill_package_struct(char *control_buffer)
new_node->version = search_name_hashtable("unknown");
while (field_start < buffer_length) {
- unsigned short field_num;
+ unsigned field_num;
field_start += read_package_field(&control_buffer[field_start],
&field_name, &field_value);
goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement ! */
}
- field_num = compare_string_array(field_names, field_name);
- switch(field_num) {
+ field_num = index_in_str_array(field_names, field_name);
+ switch (field_num) {
case 0: /* Package */
new_node->name = search_name_hashtable(field_value);
break;
if (new_node->version == search_name_hashtable("unknown")) {
free_package(new_node);
- return(-1);
+ return -1;
}
num = search_package_hashtable(new_node->name, new_node->version, VER_EQUAL);
if (package_hashtable[num] == NULL) {
} else {
free_package(new_node);
}
- return(num);
+ return num;
}
/* if num = 1, it returns the want status, 2 returns flag, 3 returns status */
/* skip past the separating spaces */
status_string += strspn(status_string, " ");
}
- len = strcspn(status_string, " \n\0");
+ len = strcspn(status_string, " \n");
state_sub_string = xstrndup(status_string, len);
state_sub_num = search_name_hashtable(state_sub_string);
free(state_sub_string);
- return(state_sub_num);
+ return state_sub_num;
}
static void set_status(const unsigned int status_node_num, const char *new_value, const int position)
char *new_status;
switch (position) {
- case (1):
+ case 1:
want = new_value_num;
want_len = new_value_len;
break;
- case (2):
+ case 2:
flag = new_value_num;
flag_len = new_value_len;
break;
- case (3):
+ case 3:
status = new_value_num;
status_len = new_value_len;
break;
static const char *describe_status(int status_num) {
int status_want, status_state ;
- if ( status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0 )
+ if (status_hashtable[status_num] == NULL || status_hashtable[status_num]->status == 0)
return "is not installed or flagged to be installed\n";
status_want = get_status(status_num, 1);
status_state = get_status(status_num, 3);
- if ( status_state == search_name_hashtable("installed") ) {
- if ( status_want == search_name_hashtable("install") )
+ if (status_state == search_name_hashtable("installed")) {
+ if (status_want == search_name_hashtable("install"))
return "is installed";
- if ( status_want == search_name_hashtable("deinstall") )
+ if (status_want == search_name_hashtable("deinstall"))
return "is marked to be removed";
- if ( status_want == search_name_hashtable("purge") )
+ if (status_want == search_name_hashtable("purge"))
return "is marked to be purged";
}
- if ( status_want == search_name_hashtable("unknown") )
+ if (status_want == search_name_hashtable("unknown"))
return "is in an indeterminate state";
- if ( status_want == search_name_hashtable("install") )
+ if (status_want == search_name_hashtable("install"))
return "is marked to be installed";
return "is not installed or flagged to be installed";
unsigned int status_num;
status_file = xfopen(filename, "r");
- while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) {
+ while ((control_buffer = xmalloc_fgets_str(status_file, "\n\n")) != NULL) {
const unsigned int package_num = fill_package_struct(control_buffer);
if (package_num != -1) {
status_node = xmalloc(sizeof(status_node_t));
if (status_line != NULL) {
status_line += 7;
status_line += strspn(status_line, " \n\t");
- status_line = xstrndup(status_line, strcspn(status_line, "\n\0"));
+ status_line = xstrndup(status_line, strcspn(status_line, "\n"));
status_node->status = search_name_hashtable(status_line);
free(status_line);
}
int i = 0;
/* Update previously known packages */
- while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) {
+ while ((control_buffer = xmalloc_fgets_str(old_status_file, "\n\n")) != NULL) {
if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) {
continue;
}
tmp_string += 8;
tmp_string += strspn(tmp_string, " \n\t");
- package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0"));
+ package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n"));
write_flag = FALSE;
tmp_string = strstr(control_buffer, "Status:");
if (tmp_string != NULL) {
(strcmp("unpacked", name_hashtable[state_status]) == 0)) {
/* We need to add the control file from the package */
i = 0;
- while(deb_file[i] != NULL) {
+ while (deb_file[i] != NULL) {
if (strcmp(package_name, name_hashtable[package_hashtable[deb_file[i]->package]->name]) == 0) {
/* Write a status file entry with a modified status */
/* remove trailing \n's */
write_buffer_no_status(new_status_file, deb_file[i]->control_file);
set_status(status_num, "ok", 2);
- fprintf(new_status_file, "Status: %s\n\n", name_hashtable[status_hashtable[status_num]->status]);
+ fprintf(new_status_file, "Status: %s\n\n",
+ name_hashtable[status_hashtable[status_num]->status]);
write_flag = TRUE;
break;
}
}
/* This is temperary, debugging only */
if (deb_file[i] == NULL) {
- bb_error_msg_and_die("ALERT: Couldnt find a control file, your status file may be broken, status may be incorrect for %s", package_name);
+ bb_error_msg_and_die("ALERT: cannot find a control file, "
+ "your status file may be broken, status may be "
+ "incorrect for %s", package_name);
}
}
else if (strcmp("not-installed", name_hashtable[state_status]) == 0) {
}
/* Write any new packages */
- for(i = 0; deb_file[i] != NULL; i++) {
+ for (i = 0; deb_file[i] != NULL; i++) {
status_num = search_status_hashtable(name_hashtable[package_hashtable[deb_file[i]->package]->name]);
if (strcmp("reinstreq", name_hashtable[get_status(status_num, 2)]) == 0) {
write_buffer_no_status(new_status_file, deb_file[i]->control_file);
xstat("/var/lib/dpkg/status", &stat_buf);
/* Its ok if renaming the status file fails because status
* file doesnt exist, maybe we are starting from scratch */
- bb_error_msg("No status file found, creating new one");
+ bb_error_msg("no status file found, creating new one");
}
if (rename("/var/lib/dpkg/status.udeb", "/var/lib/dpkg/status") == -1) {
- bb_error_msg_and_die("DANGER: Couldnt create status file, you need to manually repair your status file");
+ bb_error_msg_and_die("DANGER: cannot create status file, "
+ "you need to manually repair your status file");
}
}
/* status could be unknown if package is a pure virtual
* provides which cannot satisfy any dependency by itself.
*/
- if ( status_hashtable[status_num] == NULL )
+ if (status_hashtable[status_num] == NULL)
return 0;
switch (depend_type) {
}
if (result) {
- bb_error_msg_and_die("Package %s conflicts with %s",
+ bb_error_msg_and_die("package %s conflicts with %s",
name_hashtable[package_node->name],
name_hashtable[package_edge->name]);
}
* package is a virtual one. In which case there are
* no dependencies to check.
*/
- if ( package_node == NULL ) continue;
+ if (package_node == NULL) continue;
status_num = search_status_hashtable(name_hashtable[package_node->name]);
* virtual one provided by something else. In which
* case there are no dependencies to check.
*/
- if ( status_hashtable[status_num] == NULL ) continue;
+ if (status_hashtable[status_num] == NULL) continue;
/* If we don't want this package installed then we may
* as well ignore it's dependencies.
const edge_t *package_edge = package_node->edge[j];
unsigned int package_num;
- if ( package_edge->type == EDGE_OR_PRE_DEPENDS ||
- package_edge->type == EDGE_OR_DEPENDS ) { /* start an EDGE_OR_ list */
+ if (package_edge->type == EDGE_OR_PRE_DEPENDS ||
+ package_edge->type == EDGE_OR_DEPENDS) { /* start an EDGE_OR_ list */
number_of_alternatives = package_edge->version;
root_of_alternatives = package_edge;
continue;
- } else if ( number_of_alternatives == 0 ) { /* not in the middle of an EDGE_OR_ list */
+ } else if (number_of_alternatives == 0) { /* not in the middle of an EDGE_OR_ list */
number_of_alternatives = 1;
root_of_alternatives = NULL;
}
package_num = search_package_hashtable(package_edge->name, package_edge->version, package_edge->operator);
if (package_edge->type == EDGE_PRE_DEPENDS ||
- package_edge->type == EDGE_DEPENDS ) {
+ package_edge->type == EDGE_DEPENDS) {
int result=1;
status_num = 0;
* EDGE_DEPENDS == OR_DEPENDS -1
* EDGE_PRE_DEPENDS == OR_PRE_DEPENDS -1
*/
- if ( root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
- bb_error_msg_and_die("Fatal error. Package dependencies corrupt: %d != %d - 1",
+ if (root_of_alternatives && package_edge->type != root_of_alternatives->type - 1)
+ bb_error_msg_and_die("fatal error, package dependencies corrupt: %d != %d - 1",
package_edge->type, root_of_alternatives->type);
if (package_hashtable[package_num] != NULL)
if (result) { /* check for other package which provide what we are looking for */
int provider = -1;
- while ( (provider = search_for_provides(package_edge->name, provider) ) > -1 ) {
- if ( package_hashtable[provider] == NULL ) {
- printf("Have a provider but no package information for it\n");
+ while ((provider = search_for_provides(package_edge->name, provider)) > -1) {
+ if (package_hashtable[provider] == NULL) {
+ puts("Have a provider but no package information for it");
continue;
}
result = !package_satisfies_dependency(provider, package_edge->type);
- if ( result == 0 )
+ if (result == 0)
break;
}
}
/* It must be already installed, or to be installed */
number_of_alternatives--;
if (result && number_of_alternatives == 0) {
- if ( root_of_alternatives )
+ if (root_of_alternatives)
bb_error_msg_and_die(
- "Package %s %sdepends on %s, "
+ "package %s %sdepends on %s, "
"which cannot be satisfied",
name_hashtable[package_node->name],
package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
name_hashtable[root_of_alternatives->name]);
else
bb_error_msg_and_die(
- "Package %s %sdepends on %s, which %s\n",
+ "package %s %sdepends on %s, which %s\n",
name_hashtable[package_node->name],
package_edge->type == EDGE_PRE_DEPENDS ? "pre-" : "",
name_hashtable[package_edge->name],
describe_status(status_num));
- } else if ( result == 0 && number_of_alternatives ) {
+ } else if (result == 0 && number_of_alternatives) {
/* we've found a package which
* satisfies the dependency,
* so skip over the rest of
}
}
free(conflicts);
- return(TRUE);
+ return TRUE;
}
static char **create_list(const char *filename)
/* don't use [xw]fopen here, handle error ourself */
list_stream = fopen(filename, "r");
if (list_stream == NULL) {
- return(NULL);
+ return NULL;
}
- while ((line = bb_get_chomped_line_from_file(list_stream)) != NULL) {
+ while ((line = xmalloc_getline(list_stream)) != NULL) {
file_list = xrealloc(file_list, sizeof(char *) * (count + 2));
file_list[count] = line;
count++;
fclose(list_stream);
if (count == 0) {
- return(NULL);
+ return NULL;
} else {
file_list[count] = NULL;
- return(file_list);
+ return file_list;
}
}
int i,j;
if (remove_names == NULL) {
- return(FALSE);
+ return FALSE;
}
for (i = 0; remove_names[i] != NULL; i++) {
match_flag = FALSE;
}
}
}
- return(remove_flag);
+ return remove_flag;
}
static int run_package_script(const char *package_name, const char *script_type)
/* If the file doesnt exist is isnt a fatal */
result = lstat(script_path, &path_stat) < 0 ? EXIT_SUCCESS : system(script_path);
free(script_path);
- return(result);
+ return result;
}
static const char *all_control_files[] = {"preinst", "postinst", "prerm", "postrm",
static char **all_control_list(const char *package_name)
{
- unsigned short i = 0;
+ unsigned i = 0;
char **remove_files;
/* Create a list of all /var/lib/dpkg/info/<package> files */
i++;
}
- return(remove_files);
+ return remove_files;
}
static void free_array(char **array)
{
if (array) {
- unsigned short i = 0;
+ unsigned i = 0;
while (array[i]) {
free(array[i]);
i++;
{
int i;
- printf(" Name Version\n");
- printf("+++-==============-==============\n");
+ puts(" Name Version");
+ puts("+++-==============-==============");
/* go through status hash, dereference package hash and finally strings */
for (i=0; i<STATUS_HASH_PRIME+1; i++) {
- if (status_hashtable[i]) {
- const char *stat_str; /* status string */
+ if (status_hashtable[i]) {
+ const char *stat_str; /* status string */
const char *name_str; /* package name */
const char *vers_str; /* version */
char s1, s2; /* status abbreviations */
/* get abbreviation for status field 2 */
for (j=0, spccnt=0; stat_str[j] && spccnt<2; j++) {
- if (stat_str[j] == ' ') spccnt++;
+ if (stat_str[j] == ' ') spccnt++;
}
s2 = stat_str[j];
char conffile_name[package_name_length + 30];
int return_value;
- if ( noisy )
- printf("Removing %s (%s) ...\n", package_name, package_version);
+ if (noisy)
+ printf("Removing %s (%s)...\n", package_name, package_version);
/* run prerm script */
return_value = run_package_script(package_name, "prerm");
sprintf(conffile_name, "/var/lib/dpkg/info/%s.conffiles", package_name);
exclude_files = create_list(conffile_name);
- /* Some directories cant be removed straight away, so do multiple passes */
- while (remove_file_array(remove_files, exclude_files));
+ /* Some directories can't be removed straight away, so do multiple passes */
+ while (remove_file_array(remove_files, exclude_files)) /*repeat */;
free_array(exclude_files);
free_array(remove_files);
char **exclude_files;
char list_name[strlen(package_name) + 25];
- printf("Purging %s (%s) ...\n", package_name, package_version);
+ printf("Purging %s (%s)...\n", package_name, package_version);
/* run prerm script */
if (run_package_script(package_name, "prerm") != 0) {
exclude_files = xzalloc(sizeof(char*));
/* Some directories cant be removed straight away, so do multiple passes */
- while (remove_file_array(remove_files, exclude_files));
+ while (remove_file_array(remove_files, exclude_files)) /* repeat */;
free_array(remove_files);
/* Create a list of all /var/lib/dpkg/info/<package> files */
ar_handle->filter = filter_accept_list_reassign;
ar_handle->src_fd = xopen(filename, O_RDONLY);
- return(ar_handle);
+ return ar_handle;
}
static void init_archive_deb_control(archive_handle_t *ar_handle)
unpack_ar_archive(ar_handle);
close(ar_handle->src_fd);
- return(ar_handle->sub_archive->buffer);
+ return ar_handle->sub_archive->buffer;
}
static void data_extract_all_prefix(archive_handle_t *archive_handle)
/* If existing version, remove it first */
if (strcmp(name_hashtable[get_status(status_num, 3)], "installed") == 0) {
/* Package is already installed, remove old version first */
- printf("Preparing to replace %s %s (using %s) ...\n", package_name,
+ printf("Preparing to replace %s %s (using %s)...\n", package_name,
name_hashtable[package_hashtable[status_package_num]->version],
deb_file->filename);
remove_package(status_package_num, 0);
} else {
- printf("Unpacking %s (from %s) ...\n", package_name, deb_file->filename);
+ printf("Unpacking %s (from %s)...\n", package_name, deb_file->filename);
}
/* Extract control.tar.gz to /var/lib/dpkg/info/<package>.filename */
archive_handle = init_archive_deb_ar(deb_file->filename);
init_archive_deb_control(archive_handle);
- while(all_control_files[i]) {
+ while (all_control_files[i]) {
char *c = xasprintf("./%s", all_control_files[i]);
llist_add_to(&accept_list, c);
i++;
/* Run the preinst prior to extracting */
if (run_package_script(package_name, "preinst") != 0) {
/* when preinst returns exit code != 0 then quit installation process */
- bb_error_msg_and_die("subprocess pre-installation script returned error.");
+ bb_error_msg_and_die("subprocess pre-installation script returned error");
}
/* Extract data.tar.gz to the root directory */
const char *package_version = name_hashtable[package_hashtable[deb_file->package]->version];
const int status_num = search_status_hashtable(package_name);
- printf("Setting up %s (%s) ...\n", package_name, package_version);
+ printf("Setting up %s (%s)...\n", package_name, package_version);
/* Run the postinst script */
if (run_package_script(package_name, "postinst") != 0) {
int status_num;
int i;
+ name_hashtable = xzalloc(sizeof(name_hashtable[0]) * (NAME_HASH_PRIME + 1));
+ package_hashtable = xzalloc(sizeof(package_hashtable[0]) * (PACKAGE_HASH_PRIME + 1));
+ status_hashtable = xzalloc(sizeof(status_hashtable[0]) * (STATUS_HASH_PRIME + 1));
+
while ((opt = getopt(argc, argv, "CF:ilPru")) != -1) {
switch (opt) {
case 'C': // equivalent to --configure in official dpkg
bb_show_usage();
}
}
- /* check for non-otion argument if expected */
+ /* check for non-option argument if expected */
if ((dpkg_opt == 0) || ((argc == optind) && !(dpkg_opt && dpkg_opt_list_installed))) {
bb_show_usage();
}
/* if the list action was given print the installed packages and exit */
if (dpkg_opt & dpkg_opt_list_installed) {
list_packages();
- return(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
/* Read arguments and store relevant info in structs */
init_archive_deb_control(archive_handle);
deb_file[deb_count]->control_file = deb_extract_control_file_to_buffer(archive_handle, control_list);
if (deb_file[deb_count]->control_file == NULL) {
- bb_error_msg_and_die("Couldnt extract control file");
+ bb_error_msg_and_die("cannot extract control file");
}
deb_file[deb_count]->filename = xstrdup(argv[optind]);
package_num = fill_package_struct(deb_file[deb_count]->control_file);
if (package_num == -1) {
- bb_error_msg("Invalid control file in %s", argv[optind]);
+ bb_error_msg("invalid control file in %s", argv[optind]);
optind++;
continue;
}
search_name_hashtable(argv[optind]),
search_name_hashtable("ANY"), VER_ANY);
if (package_hashtable[deb_file[deb_count]->package] == NULL) {
- bb_error_msg_and_die("Package %s is uninstalled or unknown", argv[optind]);
+ bb_error_msg_and_die("package %s is uninstalled or unknown", argv[optind]);
}
package_num = deb_file[deb_count]->package;
status_num = search_status_hashtable(name_hashtable[package_hashtable[package_num]->name]);
if (dpkg_opt & dpkg_opt_remove) {
if ((strcmp(name_hashtable[state_status], "not-installed") == 0) ||
(strcmp(name_hashtable[state_status], "config-files") == 0)) {
- bb_error_msg_and_die("%s is already removed.", name_hashtable[package_hashtable[package_num]->name]);
+ bb_error_msg_and_die("%s is already removed", name_hashtable[package_hashtable[package_num]->name]);
}
set_status(status_num, "deinstall", 1);
}
else if (dpkg_opt & dpkg_opt_purge) {
/* if package status is "conf-files" then its ok */
if (strcmp(name_hashtable[state_status], "not-installed") == 0) {
- bb_error_msg_and_die("%s is already purged.", name_hashtable[package_hashtable[package_num]->name]);
+ bb_error_msg_and_die("%s is already purged", name_hashtable[package_hashtable[package_num]->name]);
}
set_status(status_num, "purge", 1);
}
/* Check that the deb file arguments are installable */
if ((dpkg_opt & dpkg_opt_force_ignore_depends) != dpkg_opt_force_ignore_depends) {
if (!check_deps(deb_file, 0, deb_count)) {
- bb_error_msg_and_die("Dependency check failed");
+ bb_error_msg_and_die("dependency check failed");
}
}
write_status_file(deb_file);
- for (i = 0; i < deb_count; i++) {
- free(deb_file[i]->control_file);
- free(deb_file[i]->filename);
- free(deb_file[i]);
- }
+ if (ENABLE_FEATURE_CLEAN_UP) {
+ for (i = 0; i < deb_count; i++) {
+ free(deb_file[i]->control_file);
+ free(deb_file[i]->filename);
+ free(deb_file[i]);
+ }
- free(deb_file);
+ free(deb_file);
- for (i = 0; i < NAME_HASH_PRIME; i++) {
- free(name_hashtable[i]);
- }
+ for (i = 0; i < NAME_HASH_PRIME; i++) {
+ free(name_hashtable[i]);
+ }
- for (i = 0; i < PACKAGE_HASH_PRIME; i++) {
- if (package_hashtable[i] != NULL) {
- free_package(package_hashtable[i]);
+ for (i = 0; i < PACKAGE_HASH_PRIME; i++) {
+ if (package_hashtable[i] != NULL) {
+ free_package(package_hashtable[i]);
+ }
+ }
+
+ for (i = 0; i < STATUS_HASH_PRIME; i++) {
+ free(status_hashtable[i]);
}
- }
- for (i = 0; i < STATUS_HASH_PRIME; i++) {
- free(status_hashtable[i]);
+ free(status_hashtable);
+ free(package_hashtable);
+ free(name_hashtable);
}
- return(EXIT_SUCCESS);
+ return EXIT_SUCCESS;
}
-
projects / oweals / busybox.git / blobdiff