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

Use the return value from uncompress_bunzip, fix some typo

Browse Source
This commit is contained in:
Glenn L McGrath 2003-10-29 03:37:54 +00:00
parent 1c834407e3
commit f235d05773
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
archival/bunzip2.c
View File

@ -83,16 +83,13 @@ int bunzip2_main(int argc, char **argv)
dst_fd = bb_xopen(save_name, O_WRONLY | O_CREAT); dst_fd = bb_xopen(save_name, O_WRONLY | O_CREAT);
} }
if (uncompressStream(src_fd, dst_fd) == 0) { status = uncompressStream(src_fd, dst_fd);
if (!(flags & bunzip_to_stdout)) { if(!(flags & bunzip_to_stdout)) {
if (status) {
delete_name = save_name;
} else {
delete_name = argv[optind]; delete_name = argv[optind];
} }
status = EXIT_SUCCESS;
} else {
if (!(flags & bunzip_to_stdout)) {
delete_name = save_name;
}
status = EXIT_FAILURE;
} }
if ((delete_name) && (unlink(delete_name) < 0)) { if ((delete_name) && (unlink(delete_name) < 0)) {

4
include/unarchive.h
View File

@ -35,7 +35,7 @@ typedef struct archive_handle_s {
/* process the header component, e.g. tar -t */ /* process the header component, e.g. tar -t */
void (*action_header)(const file_header_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 *); void (*action_data)(struct archive_handle_s *);
/* How to process any sub archive, e.g. get_header_tar_gz */ /* 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 */ /* Function that skips data: read_by_char or read_by_skip */
void (*seek)(const struct archive_handle_s *archive_handle, const unsigned int amount); void (*seek)(const struct archive_handle_s *archive_handle, const unsigned int amount);
/* Temperary storage */ /* Temporary storage */
char *buffer; char *buffer;
/* Misc. stuff */ /* Misc. stuff */