diff options
| author | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2015-01-23 09:50:40 +0000 |
| commit | 63dbf1908bc51918d9d963f4d9b7657306b2970d (patch) | |
| tree | 781ebfdcbbb953688e06f3541ce9e0c71f1dadfa /archival | |
| parent | 06900749637b925af1ebdf5030ba03a379f4f84f (diff) | |
| parent | 6968e081230fb6434a2a6f0eed39d538ea982f3f (diff) | |
| download | busybox-w32-TIG_1_23_0.tar.gz busybox-w32-TIG_1_23_0.tar.bz2 busybox-w32-TIG_1_23_0.zip | |
Merge commit '1_23_0' into mergeTIG_1_23_0
Conflicts:
libbb/lineedit.c
Diffstat (limited to 'archival')
| -rw-r--r-- | archival/tar.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/archival/tar.c b/archival/tar.c index e00ed26a8..85551684b 100644 --- a/archival/tar.c +++ b/archival/tar.c | |||
| @@ -747,11 +747,9 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag, | |||
| 747 | #endif | 747 | #endif |
| 748 | return errorFlag; | 748 | return errorFlag; |
| 749 | } | 749 | } |
| 750 | #else | 750 | #else /* !FEATURE_TAR_CREATE */ |
| 751 | int writeTarFile(int tar_fd, int verboseFlag, | 751 | # define writeTarFile(...) 0 |
| 752 | int recurseFlags, const llist_t *include, | 752 | #endif |
| 753 | const llist_t *exclude, const char *gzip); | ||
| 754 | #endif /* FEATURE_TAR_CREATE */ | ||
| 755 | 753 | ||
| 756 | #if ENABLE_FEATURE_TAR_FROM | 754 | #if ENABLE_FEATURE_TAR_FROM |
| 757 | static llist_t *append_file_list_to_list(llist_t *list) | 755 | static llist_t *append_file_list_to_list(llist_t *list) |