diff options
Diffstat (limited to 'archival/tar.c')
-rw-r--r-- | archival/tar.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/archival/tar.c b/archival/tar.c index 3ef89fb0a..ca802f73c 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
@@ -369,7 +369,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo, | |||
369 | /* If it is larger than 100 bytes, bail out */ | 369 | /* If it is larger than 100 bytes, bail out */ |
370 | if (header.linkname[sizeof(header.linkname)-1]) { | 370 | if (header.linkname[sizeof(header.linkname)-1]) { |
371 | free(lpath); | 371 | free(lpath); |
372 | bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); | 372 | bb_simple_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); |
373 | return FALSE; | 373 | return FALSE; |
374 | } | 374 | } |
375 | # endif | 375 | # endif |
@@ -542,7 +542,7 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb | |||
542 | 542 | ||
543 | # if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS | 543 | # if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS |
544 | if (strlen(header_name) >= NAME_SIZE) { | 544 | if (strlen(header_name) >= NAME_SIZE) { |
545 | bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); | 545 | bb_simple_error_msg("names longer than "NAME_SIZE_STR" chars not supported"); |
546 | return TRUE; | 546 | return TRUE; |
547 | } | 547 | } |
548 | # endif | 548 | # endif |
@@ -715,13 +715,13 @@ static NOINLINE int writeTarFile( | |||
715 | freeHardLinkInfo(&tbInfo->hlInfoHead); | 715 | freeHardLinkInfo(&tbInfo->hlInfoHead); |
716 | 716 | ||
717 | if (errorFlag) | 717 | if (errorFlag) |
718 | bb_error_msg("error exit delayed from previous errors"); | 718 | bb_simple_error_msg("error exit delayed from previous errors"); |
719 | 719 | ||
720 | # if SEAMLESS_COMPRESSION | 720 | # if SEAMLESS_COMPRESSION |
721 | if (gzip) { | 721 | if (gzip) { |
722 | int status; | 722 | int status; |
723 | if (safe_waitpid(-1, &status, 0) == -1) | 723 | if (safe_waitpid(-1, &status, 0) == -1) |
724 | bb_perror_msg("waitpid"); | 724 | bb_simple_perror_msg("waitpid"); |
725 | else if (!WIFEXITED(status) || WEXITSTATUS(status)) | 725 | else if (!WIFEXITED(status) || WEXITSTATUS(status)) |
726 | /* gzip was killed or has exited with nonzero! */ | 726 | /* gzip was killed or has exited with nonzero! */ |
727 | errorFlag = TRUE; | 727 | errorFlag = TRUE; |
@@ -1150,7 +1150,7 @@ int tar_main(int argc UNUSED_PARAM, char **argv) | |||
1150 | if (opt & OPT_CREATE) { | 1150 | if (opt & OPT_CREATE) { |
1151 | /* Make sure there is at least one file to tar up */ | 1151 | /* Make sure there is at least one file to tar up */ |
1152 | if (tar_handle->accept == NULL) | 1152 | if (tar_handle->accept == NULL) |
1153 | bb_error_msg_and_die("empty archive"); | 1153 | bb_simple_error_msg_and_die("empty archive"); |
1154 | 1154 | ||
1155 | tar_fd = STDOUT_FILENO; | 1155 | tar_fd = STDOUT_FILENO; |
1156 | /* Mimicking GNU tar 1.15.1: */ | 1156 | /* Mimicking GNU tar 1.15.1: */ |