minit

commit ea664f340f6ed45cde6cddb78cfdfa4d6e5f2b3f
parent 3bc0b44cdd1a3727b973d1d5e4d4c3a3448b8781
Author: leitner <leitner>
Date:   Mon, 13 Mar 2017 13:38:32 +0000

move libowfat includes

Diffstat:
M
governor.c
 | 
3
++-
M
hard-reboot.c
 | 
2
+-
M
minit-update.c
 | 
5
+++--
M
minit.c
 | 
7
++++---
M
msvc.c
 | 
11
++++++-----
M
powersave.c
 | 
3
++-
M
serdo.c
 | 
9
+++++----
M
shutdown.c
 | 
2
+-
M
waitinterface.c
 | 
5
+++--
M
waitport.c
 | 
16
+++++++++-------

10 files changed, 36 insertions(+), 27 deletions(-)
diff --git a/governor.c b/governor.c
@@ -1,8 +1,9 @@
 #include <unistd.h>
-#include <errmsg.h>
 #include <string.h>
 #include <fcntl.h>
 
+#include <libowfat/errmsg.h>
+
 const char acstate[]="/proc/acpi/ac_adapter/AC/state";
 const char sysacstate[]="/sys/class/power_supply/AC/online";
 char governor[]="/sys/devices/system/cpu/cpu0/cpufreq/scaling_governor";
diff --git a/hard-reboot.c b/hard-reboot.c
@@ -2,7 +2,7 @@
 #include <sys/reboot.h>
 #include <stdlib.h>
 
-#include "str.h"
+#include <libowfat/str.h>
 
 #define ABORTMSG "hard-reboot: Aborted.\n"
 #define USAGE "Say \"hard-reboot (RESTART|HALT|POWER_OFF)\" if you really mean it.\n"
diff --git a/minit-update.c b/minit-update.c
@@ -7,8 +7,9 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
-#include "str.h"
-#include "buffer.h"
+
+#include <libowfat/str.h>
+#include <libowfat/buffer.h>
 
 #include "minit.h"
 
diff --git a/minit.c b/minit.c
@@ -18,9 +18,10 @@
 #include <stdlib.h>
 #include <alloca.h>
 #include <sys/reboot.h>
-#include "fmt.h"
-#include "str.h"
-#include <compiletimeassert.h>
+
+#include <libowfat/fmt.h>
+#include <libowfat/str.h>
+#include <libowfat/compiletimeassert.h>
 
 #include "minit.h"
 
diff --git a/msvc.c b/msvc.c
@@ -5,13 +5,14 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include "str.h"
-#include "fmt.h"
-#include "buffer.h"
+#include <errno.h>
+
+#include <libowfat/str.h>
+#include <libowfat/fmt.h>
+#include <libowfat/buffer.h>
+#include <libowfat/errmsg.h>
 #define NOVARS
 #include "minit.h"
-#include <errmsg.h>
-#include <errno.h>
 
 static int infd,outfd;
 
diff --git a/powersave.c b/powersave.c
@@ -1,6 +1,5 @@
 #define _GNU_SOURCE
 #include <sys/types.h>
-#include <open.h>
 #include <string.h>
 #include <stdlib.h>
 #include <dirent.h>
@@ -9,6 +8,8 @@
 #include <net/if.h>
 #include <sys/ioctl.h>
 
+#include <libowfat/open.h>
+
 int write_to(const char* filename,const char* string) {
   int fd=open_write(filename);
   if (fd!=-1) {
diff --git a/serdo.c b/serdo.c
@@ -2,13 +2,14 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <ctype.h>
-#include <errmsg.h>
 #include <sys/wait.h>
-#include <str.h>
-#include <byte.h>
-#include <scan.h>
 #include <sys/resource.h>
 
+#include <libowfat/str.h>
+#include <libowfat/byte.h>
+#include <libowfat/scan.h>
+#include <libowfat/errmsg.h>
+
 #define MAXENV 256
 char* envp[MAXENV+2];
 int envc;
diff --git a/shutdown.c b/shutdown.c
@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <sys/wait.h>
 
-#include "str.h"
+#include <libowfat/str.h>
 
 #ifdef __dietlibc__
 #include <write12.h>
diff --git a/waitinterface.c b/waitinterface.c
@@ -1,14 +1,15 @@
 #include <unistd.h>
-#include <errmsg.h>
 #include <time.h>
 #include <sys/stat.h>
 #include <sys/socket.h>
 #include <string.h>
-#include <fmt.h>
 #include <netinet/in.h>
 #include <net/if.h>
 #include <sys/ioctl.h>
 
+#include <libowfat/fmt.h>
+#include <libowfat/errmsg.h>
+
 int main(int argc,char* argv[],char* envp[]) {
   unsigned int i;
   struct timespec req,rem;
diff --git a/waitport.c b/waitport.c
@@ -2,15 +2,16 @@
 #include <errmsg.h>
 #include <time.h>
 #include <string.h>
-#include <fmt.h>
-#include <scan.h>
-#include <ip4.h>
-#include <ip6.h>
-#include <stralloc.h>
-#include <buffer.h>
 #include <fcntl.h>
 #include <ctype.h>
 
+#include <libowfat/fmt.h>
+#include <libowfat/scan.h>
+#include <libowfat/ip4.h>
+#include <libowfat/ip6.h>
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
+
 static int netstat(const char* addr,unsigned int wantedport) {
   /* see linux/Documentation/networking/proc_net_tcp.txt */
   int fd=-1;
@@ -66,7 +67,8 @@ parseerror:
       /* Next token is the same thing, but we don't really need it, so
        * just skip till next whitespace */
       for (; *c && *c!=' '; ++c) ;
-      if (*c!=' ') goto parseerror; ++c;
+      if (*c!=' ') goto parseerror;
+      ++c;
       /* Next is the state; if we are looking at tcp, 0A means LISTEN */
       if (filename[10]=='t' && c[0]=='0' && c[1]=='A') {
 	/* TCP LISTEN */