Use the return value from uncompress_bunzip, fix some typo

2 files changed, 7 insertions, 10 deletions

diff --git a/archival/bunzip2.c b/archival/bunzip2.c
index 4f231c959..191dda035 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 1c4e851ab..9f1331338 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 */