Module Name: src
Committed By: riastradh
Date: Wed Jun 27 22:07:36 UTC 2012
Modified Files:
src/usr.bin/ftp: progressbar.c
src/usr.bin/progress: progress.c
Log Message:
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...
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/ftp/progressbar.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/progress/progress.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ftp/progressbar.c
diff -u src/usr.bin/ftp/progressbar.c:1.21 src/usr.bin/ftp/progressbar.c:1.22
--- src/usr.bin/ftp/progressbar.c:1.21 Sun Apr 12 10:18:52 2009
+++ src/usr.bin/ftp/progressbar.c Wed Jun 27 22:07:36 2012
@@ -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>
Index: src/usr.bin/progress/progress.c
diff -u src/usr.bin/progress/progress.c:1.19 src/usr.bin/progress/progress.c:1.20
--- src/usr.bin/progress/progress.c:1.19 Fri Sep 16 15:39:28 2011
+++ src/usr.bin/progress/progress.c Wed Jun 27 22:07:36 2012
@@ -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
