aboutsummaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDaniel O'Callaghan <danny@FreeBSD.org>1999-01-05 10:13:54 +0000
committerDaniel O'Callaghan <danny@FreeBSD.org>1999-01-05 10:13:54 +0000
commit25c4d008406f6c6e336d3502f83385ed4031e759 (patch)
tree8b0e93f136e570284fa596d8a23b78d0ce2cb9f3 /usr.bin
parent34c7ff495d35ab4c67c6bb4eefa571e9ad02548e (diff)
downloadsrc-25c4d008406f6c6e336d3502f83385ed4031e759.tar.gz
src-25c4d008406f6c6e336d3502f83385ed4031e759.zip
Merge from 2_2 man page change.
Notes
Notes: svn path=/head/; revision=42310
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/touch/touch.12
-rw-r--r--usr.bin/touch/touch.c2
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;
}