diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2015-01-16 06:40:24 +0000 |
| commit | 315054f4737a39489e0a14f3a92bff61f1592832 (patch) | |
| tree | 62bf010653374ce09b6beb4dfa0414a91457233b /usr.bin/lock/lock.c | |
| parent | 79e3d817585ca08a91e30ad14abe43e2ab70295f (diff) | |
Replace <sys/param.h> with <limits.h> and other less dirty headers where
possible. Annotate <sys/param.h> lines with their current reasons. Switch
to PATH_MAX, NGROUPS_MAX, HOST_NAME_MAX+1, LOGIN_NAME_MAX, etc. Change
MIN() and MAX() to local definitions of MINIMUM() and MAXIMUM() where
sensible to avoid pulling in the pollution. These are the files confirmed
through binary verification.
ok guenther, millert, doug (helped with the verification protocol)
Diffstat (limited to 'usr.bin/lock/lock.c')
| -rw-r--r-- | usr.bin/lock/lock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/lock/lock.c b/usr.bin/lock/lock.c index 12d89e9a756..12276498879 100644 --- a/usr.bin/lock/lock.c +++ b/usr.bin/lock/lock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: lock.c,v 1.27 2013/08/22 04:43:40 guenther Exp $ */ +/* $OpenBSD: lock.c,v 1.28 2015/01/16 06:40:09 deraadt Exp $ */ /* $NetBSD: lock.c,v 1.8 1996/05/07 18:32:31 jtc Exp $ */ /* @@ -41,7 +41,6 @@ * an argument of the form -time where time is in minutes */ -#include <sys/param.h> #include <sys/stat.h> #include <sys/time.h> #include <signal.h> @@ -55,6 +54,7 @@ #include <string.h> #include <termios.h> #include <unistd.h> +#include <limits.h> #include <login_cap.h> #include <bsd_auth.h> @@ -75,7 +75,7 @@ extern char *__progname; int main(int argc, char *argv[]) { - char hostname[MAXHOSTNAMELEN], s[BUFSIZ], s1[BUFSIZ], date[256]; + char hostname[HOST_NAME_MAX+1], s[BUFSIZ], s1[BUFSIZ], date[256]; char *p, *style, *nstyle, *ttynam; struct itimerval ntimer, otimer; int ch, sectimeout, usemine, cnt, tries = 10, backoff = 3; |