From 29493589e97a2de0c4c1c314f61ccafaee3b5caf Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 14 Jul 2016 13:04:43 -0700 Subject: archive-tar: huge offset and future timestamps would not work on 32-bit 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 --- archive-tar.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'archive-tar.c') diff --git a/archive-tar.c b/archive-tar.c index 7ea4e90814..55682404d5 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) -- cgit v1.2.1