averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'js/larger-timestamps'

Browse Source 
Some platforms have ulong that is smaller than time_t, and our
historical use of ulong for timestamp would mean they cannot
represent some timestamp that the platform allows.  Invent a
separate and dedicated timestamp_t (so that we can distingiuish
timestamps and a vanilla ulongs, which along is already a good
move), and then declare uintmax_t is the type to be used as the
timestamp_t.

* js/larger-timestamps:
  archive-tar: fix a sparse 'constant too large' warning
  use uintmax_t for timestamps
  date.c: abort if the system time cannot handle one of our timestamps
  timestamp_t: a new data type for timestamps
  PRItime: introduce a new "printf format" for timestamps
  parse_timestamp(): specify explicitly where we parse timestamps
  t0006 & t5000: skip "far in the future" test when time_t is too limited
  t0006 & t5000: prepare for 64-bit timestamps
  ref-filter: avoid using `unsigned long` for catch-all data type
This commit is contained in:
Junio C Hamano
2017-05-16 11:51:59 +09:00
parent afc5f2ce63 3f789719a6
commit b15667bbdc
55 changed files with 257 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
archive-zip.c
View File

@@ -593,9 +593,17 @@ static void write_zip_trailer(const unsigned char *sha1)
write_or_die(1, sha1_to_hex(sha1), GIT_SHA1_HEXSZ);
}
static void dos_time(time_t *time, int *dos_date, int *dos_time)
static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
{
struct tm *t = localtime(time);
time_t time;
struct tm *t;
if (date_overflows(*timestamp))
die("timestamp too large for this system: %"PRItime,
*timestamp);
time = (time_t)*timestamp;
t = localtime(&time);
*timestamp = time;
*dos_date = t->tm_mday + (t->tm_mon + 1) * 32 +
(t->tm_year + 1900 - 1980) * 512;