diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2015-03-15 00:41:29 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2015-03-15 00:41:29 +0000 |
| commit | 22eb77a8bd9284ff55e7f91c659398a9a554766a (patch) | |
| tree | a28c1053918bf9acff5523fc5d5d0b958b776fbb /usr.bin/find | |
| parent | b89e57b4b2848230b0a05f0d361e996015aecf61 (diff) | |
tzfile.h is an internal header that should never have been installed.
What's worse, the tzfile.h that gets installed is over 20 years old
and doesn't match the real tzfile.h in libc/time. This makes the
tree safe for /usr/include/tzfile.h removal. The TM_YEAR_BASE
define has been moved to time.h temporarily until its usage is
replaced by 1900 in the tree. Actual removal of tzfile.h is pending
a ports build. Based on a diff from deraadt@
Diffstat (limited to 'usr.bin/find')
| -rw-r--r-- | usr.bin/find/find.h | 5 | ||||
| -rw-r--r-- | usr.bin/find/function.c | 3 | ||||
| -rw-r--r-- | usr.bin/find/ls.c | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/find/find.h b/usr.bin/find/find.h index 6380c93f82f..0d7690f034b 100644 --- a/usr.bin/find/find.h +++ b/usr.bin/find/find.h @@ -1,4 +1,4 @@ -/* $OpenBSD: find.h,v 1.16 2015/01/19 15:30:52 krw Exp $ */ +/* $OpenBSD: find.h,v 1.17 2015/03/15 00:41:28 millert Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -133,4 +133,7 @@ typedef struct _option { int flags; } OPTION; +#define SECSPERDAY (24 * 60 * 60) +#define SIXMONTHS (SECSPERDAY * 365 / 2) + #include "extern.h" diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c index be4e013393f..6037db0b287 100644 --- a/usr.bin/find/function.c +++ b/usr.bin/find/function.c @@ -1,4 +1,4 @@ -/* $OpenBSD: function.c,v 1.42 2015/01/16 06:40:07 deraadt Exp $ */ +/* $OpenBSD: function.c,v 1.43 2015/03/15 00:41:28 millert Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -49,7 +49,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <tzfile.h> #include <unistd.h> #include "find.h" diff --git a/usr.bin/find/ls.c b/usr.bin/find/ls.c index adbc0d7e81c..230c8ea93f4 100644 --- a/usr.bin/find/ls.c +++ b/usr.bin/find/ls.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ls.c,v 1.16 2015/01/16 06:40:07 deraadt Exp $ */ +/* $OpenBSD: ls.c,v 1.17 2015/03/15 00:41:28 millert Exp $ */ /* * Copyright (c) 1989, 1993 @@ -36,7 +36,6 @@ #include <stdio.h> #include <string.h> #include <time.h> -#include <tzfile.h> #include <unistd.h> #include <limits.h> #include <utmp.h> @@ -53,7 +52,6 @@ static void printtime(time_t); #define NAME_WIDTH 8 #define DATELEN 64 -#define SIXMONTHS ((DAYSPERNYEAR / 2) * SECSPERDAY) void printlong(char *name, char *accpath, struct stat *sb) |