diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 2000-10-13 13:55:00 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 2000-10-13 13:55:00 +0000 |
| commit | 88b5352053c86aeb043f12d8ff15e6003604b63e (patch) | |
| tree | 3980ee3b72b3938e99179ec03378d4f28c5d1553 /usr.bin/touch | |
| parent | 29797fad999ccfa3ccf9f4addfab306543d3c606 (diff) | |
Missed one TM_YEAR_BASE in previous commit; pointed out by peters@telia.net
in PR 1445.
Diffstat (limited to 'usr.bin/touch')
| -rw-r--r-- | usr.bin/touch/touch.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index af14d1b468d..75641702c6c 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: touch.c,v 1.5 2000/09/20 22:25:26 pjanzen Exp $ */ +/* $OpenBSD: touch.c,v 1.6 2000/10/13 13:54:59 pjanzen Exp $ */ /* $NetBSD: touch.c,v 1.11 1995/08/31 22:10:06 jtc Exp $ */ /* @@ -44,7 +44,7 @@ static char copyright[] = #if 0 static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95"; #endif -static char rcsid[] = "$OpenBSD: touch.c,v 1.5 2000/09/20 22:25:26 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: touch.c,v 1.6 2000/10/13 13:54:59 pjanzen Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -188,7 +188,7 @@ main(argc, argv) exit(rval); } -#define ATOI2(ar) ((ar)[0] - '0') * 10 + ((ar)[1] - '0'); (ar) += 2; +#define ATOI2(s) ((s) += 2, ((s)[-2] - '0') * 10 + ((s)[-1] - '0')) void stime_arg1(arg, tvp) @@ -216,8 +216,7 @@ stime_arg1(arg, tvp) yearset = 0; switch(strlen(arg)) { case 12: /* CCYYMMDDhhmm */ - t->tm_year = ATOI2(arg); - t->tm_year *= 100; + t->tm_year = ATOI2(arg) * 100 - TM_YEAR_BASE; yearset = 1; /* FALLTHOUGH */ case 10: /* YYMMDDhhmm */ |