[PATCH v2 2/2] archive-tar: huge offset and future timestamps would not work on 32-bit
From: Junio C Hamano <hidden>
Date: 2016-07-14 20:49:59
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-07-16 · Re: [PATCH v2 2/2] archive-tar: huge offset and future timestamps would not work on 32-bit · Duy Nguyen <hidden>
- 2016-07-14 · Re: [PATCH v2 2/2] archive-tar: huge offset and future timestamps would not work on 32-bit · Junio C Hamano <hidden>
As we are not yet moving everything to size_t but still using ulong internally when talking about the size of object, platforms with 32-bit long will not be able to produce tar archive with 4GB+ file, and cannot grok 077777777777UL as a constant. Disable the extended header feature and do not test it on them. Signed-off-by: Junio C Hamano <redacted> --- archive-tar.c | 5 +++++ t/t5000-tar-tree.sh | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/archive-tar.c b/archive-tar.c
index 7ea4e90..5568240 100644
--- a/archive-tar.c
+++ b/archive-tar.c@@ -25,8 +25,13 @@ static int write_tar_filter_archive(const struct archiver *ar, * * Likewise for the mtime (which happens to use a buffer of the same size). */ +#if ULONG_MAX == 0xFFFFFFFF +#define USTAR_MAX_SIZE ULONG_MAX +#define USTAR_MAX_MTIME ULONG_MAX +#else #define USTAR_MAX_SIZE 077777777777UL #define USTAR_MAX_MTIME 077777777777UL +#endif /* writes out the whole block, but only if it is full */ static void write_if_needed(void)
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 96d208d..699355b 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh@@ -360,7 +360,7 @@ test_expect_success 'set up repository with huge blob' ' # We expect git to die with SIGPIPE here (otherwise we # would generate the whole 64GB). -test_expect_success 'generate tar with huge size' ' +test_expect_success LONG_IS_64BIT 'generate tar with huge size' ' { git archive HEAD echo $? >exit-code
@@ -369,13 +369,13 @@ test_expect_success 'generate tar with huge size' ' test_cmp expect exit-code ' -test_expect_success TAR_HUGE 'system tar can read our huge size' ' +test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' ' echo 68719476737 >expect && tar_info huge.tar | cut -d" " -f1 >actual && test_cmp expect actual ' -test_expect_success 'set up repository with far-future commit' ' +test_expect_success LONG_IS_64BIT 'set up repository with far-future commit' ' rm -f .git/index && echo content >file && git add file &&
@@ -383,11 +383,11 @@ test_expect_success 'set up repository with far-future commit' ' git commit -m "tempori parendum" ' -test_expect_success 'generate tar with future mtime' ' +test_expect_success LONG_IS_64BIT 'generate tar with future mtime' ' git archive HEAD >future.tar ' -test_expect_success TAR_HUGE 'system tar can read our future mtime' ' +test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our future mtime' ' echo 4147 >expect && tar_info future.tar | cut -d" " -f2 >actual && test_cmp expect actual
--
2.9.1-545-g8c0a069