summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2003-10-29 03:37:54 +0000
committerGlenn L McGrath2003-10-29 03:37:54 +0000
commitf235d057735a0871cd9b096bbb0ede6d42643f79 (patch)
treef709d900e417eb7b6ceef03dcff6d897a73b5714
parent1c834407e39197d9d3f127d4783b75af5e793319 (diff)
downloadbusybox-f235d057735a0871cd9b096bbb0ede6d42643f79.zip
busybox-f235d057735a0871cd9b096bbb0ede6d42643f79.tar.gz
Use the return value from uncompress_bunzip, fix some typo
-rw-r--r--archival/bunzip2.c13
-rw-r--r--include/unarchive.h4
2 files changed, 7 insertions, 10 deletions
diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 4f231c9..191dda0 100644
--- a/archival/bunzip2.c
+++ b/archival/bunzip2.c
@@ -83,16 +83,13 @@ int bunzip2_main(int argc, char **argv)
dst_fd = bb_xopen(save_name, O_WRONLY | O_CREAT);
}
- if (uncompressStream(src_fd, dst_fd) == 0) {
- if (!(flags & bunzip_to_stdout)) {
- delete_name = argv[optind];
- }
- status = EXIT_SUCCESS;
- } else {
- if (!(flags & bunzip_to_stdout)) {
+ status = uncompressStream(src_fd, dst_fd);
+ if(!(flags & bunzip_to_stdout)) {
+ if (status) {
delete_name = save_name;
+ } else {
+ delete_name = argv[optind];
}
- status = EXIT_FAILURE;
}
if ((delete_name) && (unlink(delete_name) < 0)) {
diff --git a/include/unarchive.h b/include/unarchive.h
index 1c4e851..9f13313 100644
--- a/include/unarchive.h
+++ b/include/unarchive.h
@@ -35,7 +35,7 @@ typedef struct archive_handle_s {
/* process the header component, e.g. tar -t */
void (*action_header)(const file_header_t *);
- /* process the data componenet, e.g. extract to filesystem */
+ /* process the data component, e.g. extract to filesystem */
void (*action_data)(struct archive_handle_s *);
/* How to process any sub archive, e.g. get_header_tar_gz */
@@ -56,7 +56,7 @@ typedef struct archive_handle_s {
/* Function that skips data: read_by_char or read_by_skip */
void (*seek)(const struct archive_handle_s *archive_handle, const unsigned int amount);
- /* Temperary storage */
+ /* Temporary storage */
char *buffer;
/* Misc. stuff */