diff options
Diffstat (limited to 'archival')
-rw-r--r-- | archival/ar.c | 2 | ||||
-rw-r--r-- | archival/gunzip.c | 2 | ||||
-rw-r--r-- | archival/gzip.c | 2 | ||||
-rw-r--r-- | archival/tar.c | 12 |
4 files changed, 12 insertions, 6 deletions
diff --git a/archival/ar.c b/archival/ar.c index f3ba59b6a..0f16ec88c 100644 --- a/archival/ar.c +++ b/archival/ar.c | |||
@@ -387,5 +387,5 @@ extern int ar_main(int argc, char **argv) | |||
387 | } | 387 | } |
388 | extractList=extractList->next; | 388 | extractList=extractList->next; |
389 | } | 389 | } |
390 | return (TRUE); | 390 | return EXIT_SUCCESS; |
391 | } | 391 | } |
diff --git a/archival/gunzip.c b/archival/gunzip.c index 70b25bdb0..eeff9774a 100644 --- a/archival/gunzip.c +++ b/archival/gunzip.c | |||
@@ -1350,7 +1350,7 @@ int gunzip_main(int argc, char **argv) | |||
1350 | 1350 | ||
1351 | if (delInputFile == 1 && unlink(delFileName) < 0) { | 1351 | if (delInputFile == 1 && unlink(delFileName) < 0) { |
1352 | perror(delFileName); | 1352 | perror(delFileName); |
1353 | exit(FALSE); | 1353 | return EXIT_FAILURE; |
1354 | } | 1354 | } |
1355 | } | 1355 | } |
1356 | return(exit_code); | 1356 | return(exit_code); |
diff --git a/archival/gzip.c b/archival/gzip.c index 2e147b1ca..d8c22a924 100644 --- a/archival/gzip.c +++ b/archival/gzip.c | |||
@@ -1930,7 +1930,7 @@ int gzip_main(int argc, char **argv) | |||
1930 | 1930 | ||
1931 | if (unlink(delFileName) < 0) { | 1931 | if (unlink(delFileName) < 0) { |
1932 | perror(delFileName); | 1932 | perror(delFileName); |
1933 | exit(FALSE); | 1933 | exit(EXIT_FAILURE); |
1934 | } | 1934 | } |
1935 | } | 1935 | } |
1936 | 1936 | ||
diff --git a/archival/tar.c b/archival/tar.c index 826ab9665..01997e464 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -156,6 +156,7 @@ extern int tar_main(int argc, char **argv) | |||
156 | int tostdoutFlag = FALSE; | 156 | int tostdoutFlag = FALSE; |
157 | int firstOpt = TRUE; | 157 | int firstOpt = TRUE; |
158 | int stopIt; | 158 | int stopIt; |
159 | int status; | ||
159 | 160 | ||
160 | 161 | ||
161 | if (argc <= 1) | 162 | if (argc <= 1) |
@@ -227,16 +228,21 @@ extern int tar_main(int argc, char **argv) | |||
227 | #ifndef BB_FEATURE_TAR_CREATE | 228 | #ifndef BB_FEATURE_TAR_CREATE |
228 | fatalError( "This version of tar was not compiled with tar creation support.\n"); | 229 | fatalError( "This version of tar was not compiled with tar creation support.\n"); |
229 | #else | 230 | #else |
230 | exit(writeTarFile(tarName, verboseFlag, argv, excludeList)); | 231 | status = writeTarFile(tarName, verboseFlag, argv, excludeList); |
231 | #endif | 232 | #endif |
232 | } | 233 | } |
233 | if (listFlag == TRUE || extractFlag == TRUE) { | 234 | if (listFlag == TRUE || extractFlag == TRUE) { |
234 | if (*argv) | 235 | if (*argv) |
235 | extractList = argv; | 236 | extractList = argv; |
236 | exit(readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, | 237 | status = readTarFile(tarName, extractFlag, listFlag, tostdoutFlag, |
237 | verboseFlag, extractList, excludeList)); | 238 | verboseFlag, extractList, excludeList); |
238 | } | 239 | } |
239 | 240 | ||
241 | if (status == TRUE) | ||
242 | return EXIT_SUCCESS; | ||
243 | else | ||
244 | return EXIT_FAILURE; | ||
245 | |||
240 | flagError: | 246 | flagError: |
241 | fatalError( "Exactly one of 'c', 'x' or 't' must be specified\n"); | 247 | fatalError( "Exactly one of 'c', 'x' or 't' must be specified\n"); |
242 | } | 248 | } |