diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-28 15:13:30 -0700 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-04-29 09:07:17 -0700 |
| commit | 84166a4ee77502bdb4a981bc5404a1a970c579cc (patch) | |
| tree | beb4515e12d9f12f9e239d1c257d49b16cb9e031 /core/save-git.c | |
| parent | 1cf71a476b243f2659cad72f251efe73e51d7e23 (diff) | |
| download | subsurface-84166a4ee77502bdb4a981bc5404a1a970c579cc.tar.gz | |
Extend time parsing to before 1970
It turns out that we are starting to have users that have logs that go
back that far. It won't be common, but let's get it right anyway.
NOTE! With us now supporting dates earlier in 1900, this also makes
"utc_mktime()" always add the "1900" to the year field. That way we
avoid ever using the fairly ambiguous two-digit shorthand.
It didn't use to be all that ambiguous when we knew that any two-digit
number less than 70 had to be 2000+. Now that we support going back to
earlier in the last centiry, that certainty is eroding.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/save-git.c')
| -rw-r--r-- | core/save-git.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/save-git.c b/core/save-git.c index 08161f3de..0620a3f3d 100644 --- a/core/save-git.c +++ b/core/save-git.c @@ -215,7 +215,7 @@ static void show_date(struct membuffer *b, timestamp_t when) utc_mkdate(when, &tm); put_format(b, "date %04u-%02u-%02u\n", - tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday); + tm.tm_year, tm.tm_mon + 1, tm.tm_mday); put_format(b, "time %02u:%02u:%02u\n", tm.tm_hour, tm.tm_min, tm.tm_sec); } @@ -535,7 +535,7 @@ static void create_dive_name(struct dive *dive, struct membuffer *name, struct t utc_mkdate(dive->when, &tm); if (tm.tm_year != dirtm->tm_year) - put_format(name, "%04u-", tm.tm_year + 1900); + put_format(name, "%04u-", tm.tm_year); if (tm.tm_mon != dirtm->tm_mon) put_format(name, "%02u-", tm.tm_mon+1); @@ -734,7 +734,7 @@ static int save_trip_description(git_repository *repo, struct dir *dir, dive_tri struct membuffer desc = { 0 }; put_format(&desc, "date %04u-%02u-%02u\n", - tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday); + tm->tm_year, tm->tm_mon + 1, tm->tm_mday); put_format(&desc, "time %02u:%02u:%02u\n", tm->tm_hour, tm->tm_min, tm->tm_sec); @@ -949,7 +949,7 @@ static int create_git_tree(git_repository *repo, struct dir *root, bool select_o /* Create the date-based hierarchy */ utc_mkdate(trip ? trip->when : dive->when, &tm); - tree = mktree(repo, root, "%04d", tm.tm_year + 1900); + tree = mktree(repo, root, "%04d", tm.tm_year); tree = mktree(repo, tree, "%02d", tm.tm_mon + 1); if (trip) { |