Sort includes and more cleanup and fixes in util/

chgrp.c

@@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.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"
 

chmod.c

@@ -2,8 +2,9 @@
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
 #include "util.h"
 
 static void chmodr(const char *);

cksum.c

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

cols.c

@@ -4,8 +4,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/ioctl.h>
+#include <unistd.h>
 
 #include "text.h"
 #include "util.h"

comm.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <limits.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <limits.h>
 
 #include "util.h"
 

du.c

@@ -1,13 +1,13 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <dirent.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdbool.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #include "util.h"
 

env.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
-#include <unistd.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
+#include <unistd.h>
 
 #include "util.h"
 

kill.c

@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/wait.h>
 #include <ctype.h>
 #include <errno.h>
 #include <signal.h>
@@ -8,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <strings.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "util.h"

ls.c

@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
-#include <sys/stat.h>
 
 #include "util.h"
 

md5sum.c

@@ -4,9 +4,9 @@
 #include <stdlib.h>
 #include <stdint.h>
 
-#include "util.h"
 #include "crypt.h"
 #include "md5.h"
+#include "util.h"
 
 struct md5 s;
 struct crypt_ops md5_ops = {

mkdir.c

@@ -1,12 +1,11 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "util.h"
 

mkfifo.c

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

mv.c

@@ -2,8 +2,8 @@
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "fs.h"
 #include "util.h"

rmdir.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <errno.h>
 
 #include "util.h"
 

setsid.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
 #include <errno.h>
 #include <stdio.h>
-#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "util.h"
 

sha1sum.c

@@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 
-#include "util.h"
 #include "crypt.h"
 #include "sha1.h"
+#include "util.h"
 
 struct sha1 s;
 struct crypt_ops sha1_ops = {

sha256sum.c

@@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 
-#include "util.h"
 #include "crypt.h"
 #include "sha256.h"
+#include "util.h"
 
 struct sha256 s;
 struct crypt_ops sha256_ops = {

sha512sum.c

@@ -1,12 +1,12 @@
 /* See LICENSE file for copyright and license details. */
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 
-#include "util.h"
 #include "crypt.h"
 #include "sha512.h"
+#include "util.h"
 
 struct sha512 s;
 struct crypt_ops sha512_ops = {

split.c

@@ -1,10 +1,10 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
 #include <ctype.h>
 #include <limits.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include "util.h"
 

strings.c

@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <ctype.h>
 
 #include "util.h"
 

tar.c

@@ -1,15 +1,15 @@
 /* See LICENSE file for copyright and license details. */
-#include <stdlib.h>
+#include <grp.h>
-#include <unistd.h>
+#include <limits.h>
-#include <stdio.h>
+#include <pwd.h>
 #include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include <limits.h>
+#include <sys/types.h>
-#include <grp.h>
+#include <unistd.h>
-#include <pwd.h>
 
 #include "util.h"
 

test.c

@@ -1,10 +1,10 @@
 /* See LICENSE file for copyright and license details. */
-#include <sys/stat.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "util.h"

touch.c

@@ -3,10 +3,10 @@
 #include <fcntl.h>
 #include <stdbool.h>
 #include <stdlib.h>
+#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 #include <utime.h>
-#include <sys/stat.h>
 
 #include "util.h"
 

tr.c

@@ -1,9 +1,9 @@
 /* See LICENSE file for copyright and license details. */
+#include <locale.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <locale.h>
 #include <wchar.h>
 
 #include "text.h"

tty.c

@@ -1,7 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
 
 #include "util.h"
 

uname.c

@@ -2,8 +2,8 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <sys/utsname.h>
+#include <unistd.h>
 
 #include "util.h"
 

unlink.c

@@ -1,6 +1,7 @@
 /* See LICENSE file for copyright and license details. */
-#include <unistd.h>
 #include <stdlib.h>
+#include <unistd.h>
+
 #include "util.h"
 
 static void

util/crypt.c

@@ -1,11 +1,12 @@
 /* See LICENSE file for copyright and license details. */
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdint.h>
 #include <string.h>
-#include "../util.h"
+
-#include "../text.h"
 #include "../crypt.h"
+#include "../text.h"
+#include "../util.h"
 
 static int
 hexdec(int c)

util/enmasse.c

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include "../util.h"
 

util/human.c

@@ -1,3 +1,4 @@
+/* See LICENSE file for copyright and license details. */
 #include <stdio.h>
 #include <string.h>
 

util/md5.c

@@ -1,6 +1,7 @@
 /* public domain md5 implementation based on rfc1321 and libtomcrypt */
 #include <stdint.h>
 #include <string.h>
+
 #include "../md5.h"
 
 static uint32_t rol(uint32_t n, int k) { return (n << k) | (n >> (32-k)); }

util/mode.c

@@ -1,7 +1,8 @@
-#include <unistd.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
 #include "../util.h"
 
 mode_t

util/putword.c

@@ -15,4 +15,3 @@ putword(const char *s)
 	fputs(s, stdout);
 	first = false;
 }
-

util/rm.c

@@ -15,4 +15,3 @@ rm(const char *path)
 	if (remove(path) == -1 && !rm_fflag)
 		eprintf("remove %s:", path);
 }
-

util/sha1.c

@@ -1,6 +1,7 @@
 /* public domain sha1 implementation based on rfc3174 and libtomcrypt */
 #include <stdint.h>
 #include <string.h>
+
 #include "../sha1.h"
 
 static uint32_t rol(uint32_t n, int k) { return (n << k) | (n >> (32-k)); }

util/sha256.c

@@ -1,9 +1,10 @@
 /* public domain sha256 implementation based on fips180-3 */
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../sha256.h"
 
 static uint32_t ror(uint32_t n, int k) { return (n >> k) | (n << (32-k)); }

util/sha512.c

@@ -1,10 +1,11 @@
 /* public domain sha256 implementation based on fips180-3 */
 
 #include <ctype.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "../sha512.h"
 
 static uint64_t ror(uint64_t n, int k) { return (n >> k) | (n << (64-k)); }

util/strlcat.c

@@ -14,8 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <string.h>
+#include <sys/types.h>
+
 #include "../util.h"
 
 /*

util/strlcpy.c

@@ -14,8 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <sys/types.h>
 #include <string.h>
+#include <sys/types.h>
+
 #include "../util.h"
 
 /*

uudecode.c

@@ -1,15 +1,15 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <limits.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
-#include <limits.h>
 
-#include "util.h"
 #include "text.h"
+#include "util.h"
 
 static void uudecode(FILE *, FILE *);
 static void parseheader(FILE *, const char *, const char *, mode_t *, char **);