From 25c4d008406f6c6e336d3502f83385ed4031e759 Mon Sep 17 00:00:00 2001 From: Daniel O'Callaghan Date: Tue, 5 Jan 1999 10:13:54 +0000 Subject: [PATCH] Merge from 2_2 man page change. --- usr.bin/touch/touch.1 | 2 +- usr.bin/touch/touch.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/touch/touch.1 b/usr.bin/touch/touch.1 index f8a7d3e873d3..b3a0b173e21f 100644 --- a/usr.bin/touch/touch.1 +++ b/usr.bin/touch/touch.1 @@ -152,7 +152,7 @@ letter pairs are treated as their counterparts specified to the option. If the .Dq YY -letter pair is in the range 69 to 99, the year is set to 1969 to 1999, +letter pair is in the range 39 to 99, the year is set to 1939 to 1999, otherwise, the year is set in the 21st century. .Sh HISTORY A diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 81e596a9b4d0..b5f19dcf95fd 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -262,7 +262,7 @@ stime_arg2(arg, year, tvp) t->tm_min = ATOI2(arg); if (year) { t->tm_year = ATOI2(arg); - if (t->tm_year < 38) /* support 2000-2038 not 1902-1969 */ + if (t->tm_year < 39) /* support 2000-2038 not 1902-1969 */ t->tm_year += 100; }