summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2013-11-15 22:20:05 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2013-11-15 22:20:05 +0000
commitd77db38a99c37922b14991741a09951af3b0c621 (patch)
tree644b057604244c23082f5a592a93f036f54a930d
parentdc67839142fd08f2b381632ad5f6519757336005 (diff)
Include unistd.h as it is the standard location for getopt().
-rw-r--r--sbin/lmccontrol/lmccontrol.c3
-rw-r--r--sbin/restore/main.c3
-rw-r--r--sbin/sysctl/sysctl.c3
-rw-r--r--usr.bin/diff3/diff3prog.c7
-rw-r--r--usr.bin/find/main.c3
-rw-r--r--usr.bin/getcap/getcap.c3
-rw-r--r--usr.bin/join/join.c3
-rw-r--r--usr.bin/lam/lam.c3
-rw-r--r--usr.bin/locale/locale.c3
-rw-r--r--usr.bin/nl/nl.c3
-rw-r--r--usr.bin/renice/renice.c3
-rw-r--r--usr.bin/unvis/unvis.c5
-rw-r--r--usr.bin/users/users.c8
-rw-r--r--usr.bin/whatis/whatis.c3
-rw-r--r--usr.bin/ypwhich/ypwhich.c12
-rw-r--r--usr.sbin/spamdb/spamdb.c3
16 files changed, 42 insertions, 26 deletions
diff --git a/sbin/lmccontrol/lmccontrol.c b/sbin/lmccontrol/lmccontrol.c
index 4bfc24a0850..d4c3facb400 100644
--- a/sbin/lmccontrol/lmccontrol.c
+++ b/sbin/lmccontrol/lmccontrol.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lmccontrol.c,v 1.9 2006/12/06 05:56:03 jcs Exp $ */
+/* $OpenBSD: lmccontrol.c,v 1.10 2013/11/15 22:20:04 millert Exp $ */
/*-
* Copyright (c) 1997-1999 LAN Media Corporation (LMC)
@@ -44,6 +44,7 @@
#include <err.h>
#include <errno.h>
#include <string.h>
+#include <unistd.h>
#include <sys/param.h>
#include <sys/types.h>
diff --git a/sbin/restore/main.c b/sbin/restore/main.c
index f265ef8702f..f04083c6969 100644
--- a/sbin/restore/main.c
+++ b/sbin/restore/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.19 2009/10/27 23:59:34 deraadt Exp $ */
+/* $OpenBSD: main.c,v 1.20 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: main.c,v 1.13 1997/07/01 05:37:51 lukem Exp $ */
/*
@@ -44,6 +44,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include "restore.h"
#include "extern.h"
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 3170d56bdfc..894a61ff949 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.196 2013/11/12 19:42:47 deraadt Exp $ */
+/* $OpenBSD: sysctl.c,v 1.197 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -102,6 +102,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
+#include <unistd.h>
#include <machine/cpu.h>
diff --git a/usr.bin/diff3/diff3prog.c b/usr.bin/diff3/diff3prog.c
index c6677ce2b61..35c532c2e9f 100644
--- a/usr.bin/diff3/diff3prog.c
+++ b/usr.bin/diff3/diff3prog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff3prog.c,v 1.12 2012/03/04 04:05:15 fgsch Exp $ */
+/* $OpenBSD: diff3prog.c,v 1.13 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (C) Caldera International Inc. 2001-2002.
@@ -64,11 +64,12 @@
* @(#)diff3.c 8.1 (Berkeley) 6/6/93
*/
+#include <ctype.h>
+#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ctype.h>
-#include <err.h>
+#include <unistd.h>
/* diff3 - 3-way differential file comparison */
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 64f9ab60d35..2a0b28f479e 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.28 2011/06/14 21:04:05 naddy Exp $ */
+/* $OpenBSD: main.c,v 1.29 2013/11/15 22:20:04 millert Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,6 +41,7 @@
#include <stdlib.h>
#include <string.h>
#include <time.h>
+#include <unistd.h>
#include "find.h"
diff --git a/usr.bin/getcap/getcap.c b/usr.bin/getcap/getcap.c
index 7fb81159a7d..df71e8f9860 100644
--- a/usr.bin/getcap/getcap.c
+++ b/usr.bin/getcap/getcap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getcap.c,v 1.3 2009/10/27 23:59:38 deraadt Exp $ */
+/* $OpenBSD: getcap.c,v 1.4 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (c) 2005 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -20,6 +20,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
enum captype {
boolean,
diff --git a/usr.bin/join/join.c b/usr.bin/join/join.c
index d4b5ed89e4d..b0dc1da9e77 100644
--- a/usr.bin/join/join.c
+++ b/usr.bin/join/join.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: join.c,v 1.21 2009/10/27 23:59:39 deraadt Exp $ */
+/* $OpenBSD: join.c,v 1.22 2013/11/15 22:20:04 millert Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -39,6 +39,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
/*
* There's a structure per input file which encapsulates the state of the
diff --git a/usr.bin/lam/lam.c b/usr.bin/lam/lam.c
index 3e5c8df75c0..231d25dfebe 100644
--- a/usr.bin/lam/lam.c
+++ b/usr.bin/lam/lam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lam.c,v 1.14 2009/10/27 23:59:39 deraadt Exp $ */
+/* $OpenBSD: lam.c,v 1.15 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: lam.c,v 1.2 1994/11/14 20:27:42 jtc Exp $ */
/*-
@@ -42,6 +42,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#define BIGBUFSIZ 5 * BUFSIZ
diff --git a/usr.bin/locale/locale.c b/usr.bin/locale/locale.c
index 781cdf064f2..ffde165bcfd 100644
--- a/usr.bin/locale/locale.c
+++ b/usr.bin/locale/locale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: locale.c,v 1.7 2013/11/13 20:44:21 deraadt Exp $ */
+/* $OpenBSD: locale.c,v 1.8 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (c) 2013 Stefan Sperling <stsp@openbsd.org>
*
@@ -19,6 +19,7 @@
#include <stdlib.h>
#include <string.h>
#include <locale.h>
+#include <unistd.h>
extern char *__progname;
diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c
index d3ea32bad45..8d1d058227f 100644
--- a/usr.bin/nl/nl.c
+++ b/usr.bin/nl/nl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nl.c,v 1.1 2013/09/08 18:59:07 jca Exp $ */
+/* $OpenBSD: nl.c,v 1.2 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: nl.c,v 1.11 2011/08/16 12:00:46 christos Exp $ */
/*-
@@ -40,6 +40,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <wchar.h>
typedef enum {
diff --git a/usr.bin/renice/renice.c b/usr.bin/renice/renice.c
index a4a304d9f2a..fc36c4ccd55 100644
--- a/usr.bin/renice/renice.c
+++ b/usr.bin/renice/renice.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: renice.c,v 1.15 2009/10/27 23:59:42 deraadt Exp $ */
+/* $OpenBSD: renice.c,v 1.16 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (c) 2009 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -28,6 +28,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
struct renice_param {
int pri;
diff --git a/usr.bin/unvis/unvis.c b/usr.bin/unvis/unvis.c
index 0898c07a0fb..ad5a930cad0 100644
--- a/usr.bin/unvis/unvis.c
+++ b/usr.bin/unvis/unvis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: unvis.c,v 1.9 2009/10/27 23:59:46 deraadt Exp $ */
+/* $OpenBSD: unvis.c,v 1.10 2013/11/15 22:20:04 millert Exp $ */
/*-
* Copyright (c) 1989, 1993
@@ -29,9 +29,10 @@
* SUCH DAMAGE.
*/
+#include <err.h>
#include <stdio.h>
#include <stdlib.h>
-#include <err.h>
+#include <unistd.h>
#include <vis.h>
void process(FILE *fp, const char *filename);
diff --git a/usr.bin/users/users.c b/usr.bin/users/users.c
index ce2acddfd0f..206af35e1db 100644
--- a/usr.bin/users/users.c
+++ b/usr.bin/users/users.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: users.c,v 1.9 2009/10/27 23:59:46 deraadt Exp $ */
+/* $OpenBSD: users.c,v 1.10 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: users.c,v 1.5 1994/12/20 15:58:19 jtc Exp $ */
/*
@@ -31,11 +31,13 @@
*/
#include <sys/types.h>
-#include <utmp.h>
+
+#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <err.h>
+#include <unistd.h>
+#include <utmp.h>
typedef char namebuf[UT_NAMESIZE];
diff --git a/usr.bin/whatis/whatis.c b/usr.bin/whatis/whatis.c
index 0cbca42fe24..ae6807dad8a 100644
--- a/usr.bin/whatis/whatis.c
+++ b/usr.bin/whatis/whatis.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: whatis.c,v 1.13 2009/10/27 23:59:50 deraadt Exp $ */
+/* $OpenBSD: whatis.c,v 1.14 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -37,6 +37,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include "../man/config.h"
#include "../man/pathnames.h"
diff --git a/usr.bin/ypwhich/ypwhich.c b/usr.bin/ypwhich/ypwhich.c
index 7a9560c4ca6..961d87656ec 100644
--- a/usr.bin/ypwhich/ypwhich.c
+++ b/usr.bin/ypwhich/ypwhich.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ypwhich.c,v 1.20 2009/10/27 23:59:50 deraadt Exp $ */
+/* $OpenBSD: ypwhich.c,v 1.21 2013/11/15 22:20:04 millert Exp $ */
/* $NetBSD: ypwhich.c,v 1.6 1996/05/13 02:43:48 thorpej Exp $ */
/*
@@ -31,16 +31,16 @@
#include <sys/types.h>
#include <sys/socket.h>
-#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
#include <ctype.h>
-#include <netdb.h>
#include <err.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
#include <rpc/rpc.h>
#include <rpc/xdr.h>
diff --git a/usr.sbin/spamdb/spamdb.c b/usr.sbin/spamdb/spamdb.c
index 70e2b6ba4e9..b06ca256929 100644
--- a/usr.sbin/spamdb/spamdb.c
+++ b/usr.sbin/spamdb/spamdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spamdb.c,v 1.27 2013/08/21 16:13:29 millert Exp $ */
+/* $OpenBSD: spamdb.c,v 1.28 2013/11/15 22:20:04 millert Exp $ */
/*
* Copyright (c) 2004 Bob Beck. All rights reserved.
@@ -30,6 +30,7 @@
#include <netdb.h>
#include <ctype.h>
#include <errno.h>
+#include <unistd.h>
#include "grey.h"