Clean up #includes

8 years ago · 31572c8b0e
parent 71fb259d02
commit 31572c8b0e
63 changed files with 42 additions and 142 deletions
--- a/basename.c
+++ b/basename.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <libgen.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>

 #include "util.h"
--- a/cat.c
+++ b/cat.c
@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
-#include <stdlib.h>
 #include <unistd.h>

 #include "text.h"
--- a/chgrp.c
+++ b/chgrp.c
@ -1,11 +1,8 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
 #include <grp.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>

 #include "util.h"
--- a/chmod.c
+++ b/chmod.c
@ -1,8 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdlib.h>
-#include <string.h>
 #include <sys/stat.h>
-#include <unistd.h>

 #include "util.h"

--- a/cksum.c
+++ b/cksum.c
@ -1,9 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <inttypes.h>
-#include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>

 #include "util.h"

--- a/cmp.c
+++ b/cmp.c
@ -1,8 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>

 #include "util.h"

--- a/cols.c
+++ b/cols.c
@ -1,10 +1,11 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/ioctl.h>
+
 #include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/ioctl.h>
 #include <unistd.h>

 #include "text.h"
--- a/comm.c
+++ b/comm.c
@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/cp.c
+++ b/cp.c
@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdlib.h>
 #include <sys/stat.h>

 #include "fs.h"
--- a/cron.c
+++ b/cron.c
@ -1,10 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/types.h>
 #include <sys/wait.h>

 #include <errno.h>
-#include <limits.h>
-#include <signal.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
--- a/cut.c
+++ b/cut.c
@ -3,7 +3,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include "text.h"
 #include "utf.h"
 #include "util.h"

--- a/date.c
+++ b/date.c
@ -1,9 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include <unistd.h>

 #include "util.h"

--- a/dirname.c
+++ b/dirname.c
@ -1,8 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <libgen.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>

 #include "util.h"

--- a/du.c
+++ b/du.c
@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+#include <sys/types.h>
+
 #include <dirent.h>
-#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>

 #include "util.h"
--- a/echo.c
+++ b/echo.c
@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
-#include <stdlib.h>

 #include "util.h"

--- a/expand.c
+++ b/expand.c
@ -1,9 +1,6 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>

 #include "utf.h"
 #include "util.h"
--- a/expr.c
+++ b/expr.c
@ -1,8 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <inttypes.h>
-#include <limits.h>
-#include <regex.h>
-#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
--- a/fold.c
+++ b/fold.c
@ -1,10 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
-#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>

 #include "util.h"

--- a/grep.c
+++ b/grep.c
@ -3,11 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <unistd.h>

 #include "queue.h"
-#include "text.h"
 #include "util.h"

 enum { Match = 0, NoMatch = 1, Error = 2 };
--- a/head.c
+++ b/head.c
@ -1,10 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>

 #include "util.h"

--- a/hostname.c
+++ b/hostname.c
@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
--- a/kill.c
+++ b/kill.c
@ -1,13 +1,11 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/wait.h>
+
 #include <ctype.h>
 #include <errno.h>
-#include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
-#include <sys/wait.h>
-#include <unistd.h>

 #include "util.h"

--- a/link.c
+++ b/link.c
@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <unistd.h>

 #include "util.h"
--- a/ln.c
+++ b/ln.c
@ -1,11 +1,8 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
+#include <sys/stat.h>
+
 #include <fcntl.h>
 #include <libgen.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
 #include <unistd.h>

 #include "util.h"
--- a/logger.c
+++ b/logger.c
@ -2,7 +2,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <strings.h>
 #define SYSLOG_NAMES
 #include <syslog.h>
 #include <unistd.h>
--- a/ls.c
+++ b/ls.c
@ -1,11 +1,12 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <dirent.h>
 #include <grp.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>

--- a/mkdir.c
+++ b/mkdir.c
@ -1,10 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
-#include <fcntl.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>

 #include "util.h"

--- a/mkfifo.c
+++ b/mkfifo.c
@ -1,8 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <fcntl.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <unistd.h>
+
+#include <stdlib.h>

 #include "util.h"

--- a/mktemp.c
+++ b/mktemp.c
@ -1,9 +1,7 @@
 /* See LICENSE file for copyright and license details. */
 #include <libgen.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
 #include <unistd.h>

 #include "util.h"
--- a/mv.c
+++ b/mv.c
@ -1,9 +1,8 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <unistd.h>

 #include "fs.h"
 #include "util.h"
--- a/nice.c
+++ b/nice.c
@ -1,10 +1,8 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/resource.h>
+
 #include <errno.h>
-#include <limits.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <sys/resource.h>
-#include <sys/time.h>
 #include <unistd.h>

 #include "util.h"
--- a/nl.c
+++ b/nl.c
@ -1,11 +1,8 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
-#include <regex.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>

 #include "text.h"
 #include "util.h"
--- a/nohup.c
+++ b/nohup.c
@ -1,10 +1,10 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <stdlib.h>
 #include <unistd.h>
-#include <sys/stat.h>

 #include "util.h"

--- a/paste.c
+++ b/paste.c
@ -1,9 +1,6 @@
 /* See LICENSE file for copyright and license details. */
-#include <locale.h>
 #include <stdlib.h>
-#include <stdio.h>
 #include <string.h>
-#include <unistd.h>

 #include "utf.h"
 #include "util.h"
--- a/pwd.c
+++ b/pwd.c
@ -1,8 +1,8 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>

 #include "util.h"

--- a/readlink.c
+++ b/readlink.c
@ -1,11 +1,10 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <unistd.h>
-#include <errno.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>

 #include "util.h"

--- a/renice.c
+++ b/renice.c
@ -1,11 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/resource.h>
+
 #include <errno.h>
-#include <limits.h>
 #include <pwd.h>
-#include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/resource.h>

 #include "util.h"

--- a/rm.c
+++ b/rm.c
@ -1,9 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
 #include "fs.h"
 #include "util.h"

--- a/rmdir.c
+++ b/rmdir.c
@ -1,7 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <libgen.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>

--- a/sed.c
+++ b/sed.c
@ -15,7 +15,6 @@
 #include <ctype.h>
 #include <errno.h>
 #include <regex.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

--- a/seq.c
+++ b/seq.c
@ -1,9 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>

 #include "util.h"

--- a/setsid.c
+++ b/setsid.c
@ -1,8 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>

 #include "util.h"
--- a/sha1sum.c
+++ b/sha1sum.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>

 #include "crypt.h"
 #include "sha1.h"
--- a/sha256sum.c
+++ b/sha256sum.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>

 #include "crypt.h"
 #include "sha256.h"
--- a/sha512sum.c
+++ b/sha512sum.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdint.h>
 #include <stdio.h>
-#include <stdlib.h>

 #include "crypt.h"
 #include "sha512.h"
--- a/sleep.c
+++ b/sleep.c
@ -1,6 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
-#include <stdlib.h>
 #include <unistd.h>

 #include "util.h"
--- a/sort.c
+++ b/sort.c
@ -3,7 +3,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>

 #include "text.h"
 #include "util.h"
--- a/split.c
+++ b/split.c
@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
-#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/strings.c
+++ b/strings.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <ctype.h>
 #include <stdio.h>
-#include <stdlib.h>

 #include "util.h"

--- a/tail.c
+++ b/tail.c
@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <sys/stat.h>

-#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/tar.c
+++ b/tar.c
@ -1,10 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <sys/types.h>

 #include <grp.h>
-#include <limits.h>
 #include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
--- a/tee.c
+++ b/tee.c
@ -1,8 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 #include <signal.h>
 #include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>

 #include "util.h"

--- a/test.c
+++ b/test.c
@ -1,8 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <limits.h>
-#include <stdio.h>
-#include <string.h>
 #include <sys/stat.h>
+
+#include <string.h>
 #include <unistd.h>

 #include "utf.h"
--- a/touch.c
+++ b/touch.c
@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
 #include <fcntl.h>
-#include <limits.h>
 #include <stdlib.h>
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
--- a/tr.c
+++ b/tr.c
@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
 #include <stdlib.h>

 #include "utf.h"
--- a/uname.c
+++ b/uname.c
@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
 #include <sys/utsname.h>
-#include <unistd.h>
+
+#include <stdio.h>

 #include "util.h"

--- a/unexpand.c
+++ b/unexpand.c
@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdint.h>
-#include <stdio.h>
 #include <stdlib.h>

 #include "utf.h"
--- a/uniq.c
+++ b/uniq.c
@ -1,11 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
-#include <ctype.h>

-#include "text.h"
 #include "util.h"

 static void uniqline(FILE *, char *);
--- a/uudecode.c
+++ b/uudecode.c
@ -1,14 +1,11 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/stat.h>
+
 #include <errno.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>

-#include "text.h"
 #include "util.h"

 static int mflag = 0;
--- a/uuencode.c
+++ b/uuencode.c
@ -1,9 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
+
+#include <stdio.h>

 #include "util.h"

--- a/wc.c
+++ b/wc.c
@ -1,7 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <unistd.h>
-
 #include "utf.h"
 #include "util.h"

--- a/xargs.c
+++ b/xargs.c
@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
+#include <sys/wait.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/wait.h>
 #include <unistd.h>

-#include "text.h"
 #include "util.h"

 enum {
--- a/yes.c
+++ b/yes.c
@ -1,6 +1,5 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdio.h>
-#include <stdlib.h>

 #include "util.h"