aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2012-06-27 22:07:36 +0000
committerriastradh <riastradh@NetBSD.org>2012-06-27 22:07:36 +0000
commitd80f4bd9104c017f4691f9c6438734f68262d3e2 (patch)
treeaef866fa3371126ea28c970641d2bb855e9b4066
parent6e136e80f3716a873f9001ea65abb482acc22a04 (diff)
downloadbsd-progress-d80f4bd9104c017f4691f9c6438734f68262d3e2.tar.gz
bsd-progress-d80f4bd9104c017f4691f9c6438734f68262d3e2.tar.zst
bsd-progress-d80f4bd9104c017f4691f9c6438734f68262d3e2.zip
Clean up #includes in progress(1).
Sort them, omit needless ones, and add omitted needful ones. Omissions revealed by pilfering the code and trying to build it on Mac OS X. We ought to have a better way to reveal these omissions...
-rw-r--r--progress.c17
-rw-r--r--progressbar.c7
2 files changed, 8 insertions, 16 deletions
diff --git a/progress.c b/progress.c
index 5e4f8ee..e649989 100644
--- a/progress.c
+++ b/progress.c
@@ -1,4 +1,4 @@
-/* $NetBSD: progress.c,v 1.19 2011/09/16 15:39:28 joerg Exp $ */
+/* $NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,32 +31,23 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progress.c,v 1.19 2011/09/16 15:39:28 joerg Exp $");
+__RCSID("$NetBSD: progress.c,v 1.20 2012/06/27 22:07:36 riastradh Exp $");
#endif /* not lint */
#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <sys/time.h>
+#include <sys/stat.h>
#include <sys/wait.h>
-#include <netinet/in.h>
-#include <arpa/ftp.h>
#include <err.h>
#include <errno.h>
#include <fcntl.h>
-#include <glob.h>
-#include <signal.h>
#include <inttypes.h>
#include <limits.h>
-#include <netdb.h>
+#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <termios.h>
-#include <time.h>
-#include <tzfile.h>
#include <unistd.h>
#define GLOBAL /* force GLOBAL decls in progressbar.h to be
diff --git a/progressbar.c b/progressbar.c
index d7edd27..2350776 100644
--- a/progressbar.c
+++ b/progressbar.c
@@ -1,4 +1,4 @@
-/* $NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $ */
+/* $NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -31,14 +31,15 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: progressbar.c,v 1.21 2009/04/12 10:18:52 lukem Exp $");
+__RCSID("$NetBSD: progressbar.c,v 1.22 2012/06/27 22:07:36 riastradh Exp $");
#endif /* not lint */
/*
* FTP User Program -- Misc support routines
*/
-#include <sys/types.h>
#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/time.h>
#include <err.h>
#include <errno.h>