great include fix

test/array.c

@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "array.h"
-#include "byte.h"
+#include <libowfat/array.h>
+#include <libowfat/byte.h>
 
 int main() {
   static array x,y;

test/b64decode.c

@@ -1,7 +1,7 @@
 #include <string.h>
 #include <unistd.h>
-#include "buffer.h"
-#include "textcode.h"
+#include <libowfat/buffer.h>
+#include <libowfat/textcode.h>
 #include "havealloca.h"
 
 void b64encode(const char* c) {

test/b64encode.c

@@ -1,7 +1,7 @@
 #include <unistd.h>
 #include <string.h>
-#include "buffer.h"
-#include "textcode.h"
+#include <libowfat/buffer.h>
+#include <libowfat/textcode.h>
 #include "havealloca.h"
 
 void b64encode(const char* c,long len) {

test/buffer_1.c

@@ -1,4 +1,4 @@
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 int main() {
   buffer_puts(buffer_1,"ulong: ");

test/buffer_fromsa.c

@@ -1,5 +1,5 @@
-#include "stralloc.h"
-#include "buffer.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
 
 int main() {
   stralloc sa;

test/buffer_mmap.c

@@ -1,4 +1,4 @@
-#include "buffer.h"
+#include <libowfat/buffer.h>
 
 int main() {
   buffer input;

test/buffer_tosa.c

@@ -1,6 +1,6 @@
-#include "byte.h"
-#include "stralloc.h"
-#include "buffer.h"
+#include <libowfat/byte.h>
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
 #include <assert.h>
 
 int main() {

test/byte_copy.c

@@ -1,6 +1,6 @@
-#include "byte.h"
+#include <libowfat/byte.h>
+#include <libowfat/errmsg.h>
 #include <assert.h>
-#include "errmsg.h"
 #include <string.h>
 
 char buf[4096];

test/cdbget2.c

@@ -1,9 +1,9 @@
-#include <cdb.h>
-#include "buffer.h"
+#include <libowfat/cdb.h>
+#include <libowfat/buffer.h>
+#include <libowfat/errmsg.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
-#include "errmsg.h"
 
 #ifndef O_BINARY
 #define O_BINARY 0

test/cescape.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "buffer.h"
-#include "textcode.h"
+#include <libowfat/buffer.h>
+#include <libowfat/textcode.h>
 #include "havealloca.h"
 #include <unistd.h>
 

test/client.c

@@ -1,13 +1,13 @@
-#include "scan.h"
-#include "ip6.h"
-#include "str.h"
+#include <libowfat/scan.h>
+#include <libowfat/ip6.h>
+#include <libowfat/str.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/poll.h>
 #include <unistd.h>
-#include "socket.h"
+#include <libowfat/socket.h>
 #include <sys/socket.h>
-#include "ndelay.h"
+#include <libowfat/ndelay.h>
 #ifdef __dietlibc__
 #include <write12.h>
 #else

test/dllink.c

@@ -1,11 +1,10 @@
-#include <socket.h>
+#include <libowfat/socket.h>
+#include <libowfat/buffer.h>
+#include <libowfat/case.h>
+#include <libowfat/ndelay.h>
 
-#include "socket.h"
-#include "buffer.h"
 #include <unistd.h>
 #include <stdio.h>
-#include "case.h"
-#include "ndelay.h"
 
 int main(int argc,char* argv[]) {
   int s=socket_tcp4b();

test/dnsip.c

@@ -1,9 +1,9 @@
-#include <dns.h>
-#include <ip4.h>
-#include "buffer.h"
+#include <libowfat/dns.h>
+#include <libowfat/ip4.h>
+#include <libowfat/buffer.h>
+#include <libowfat/errmsg.h>
 #include <errno.h>
 #include <string.h>
-#include "errmsg.h"
 
 int main(int argc,char* argv[]) {
   static char seed[128];

test/fdpassing.c

@@ -1,6 +1,6 @@
 #include <unistd.h>
-#include "io.h"
-#include "buffer.h"
+#include <libowfat/io.h>
+#include <libowfat/buffer.h>
 #include <stdlib.h>
 
 void child(int64 fd) {

test/fmt.c

@@ -1,4 +1,4 @@
-#include "fmt.h"
+#include <libowfat/fmt.h>
 #include <string.h>
 #include <assert.h>
 

test/fmt_httpdate.c

@@ -1,7 +1,7 @@
 #include <time.h>
-#include "scan.h"
-#include "buffer.h"
-#include "fmt.h"
+#include <libowfat/scan.h>
+#include <libowfat/buffer.h>
+#include <libowfat/fmt.h>
 
 int main() {
   char buf[100];

test/fmt_human.c

@@ -1,5 +1,5 @@
-#include "fmt.h"
-#include "buffer.h"
+#include <libowfat/fmt.h>
+#include <libowfat/buffer.h>
 
 int main() {
   char buf[1024];

test/fmt_ip6.c

@@ -1,4 +1,4 @@
-#include "ip6.h"
+#include <libowfat/ip6.h>
 #include <assert.h>
 #include <string.h>
 

test/fmt_iso8691.c

@@ -1,5 +1,5 @@
-#include "fmt.h"
-#include "scan.h"
+#include <libowfat/fmt.h>
+#include <libowfat/scan.h>
 #include <assert.h>
 #include <unistd.h>
 

test/fmt_long.c

@@ -1,5 +1,5 @@
-#include "fmt.h"
-#include "str.h"
+#include <libowfat/fmt.h>
+#include <libowfat/str.h>
 #include <assert.h>
 
 int main() {

test/fmt_longlong.c

@@ -1,8 +1,8 @@
-#include "fmt.h"
-#include "str.h"
+#include <libowfat/fmt.h>
+#include <libowfat/str.h>
+#include <libowfat/scan.h>
+#include <libowfat/byte.h>
 #include <assert.h>
-#include "scan.h"
-#include <byte.h>
 
 int main() {
   char buf[1024];

test/fmt_strm_alloca.c

@@ -1,6 +1,6 @@
-#include <stdlib.h>
-#include "fmt.h"
-#include "byte.h"
+#include "havealloca.h"
+#include <libowfat/fmt.h>
+#include <libowfat/byte.h>
 #include <assert.h>
 
 int main() {

test/fmt_xmlescape.c

@@ -0,0 +1,15 @@
+#include <libowfat/fmt.h>
+#include <libowfat/byte.h>
+#include <assert.h>
+
+int main() {
+  char buf[100];
+  assert(fmt_xmlescape(buf,0)==0);
+  assert(fmt_xmlescape(buf,23)==1);
+  assert(fmt_xmlescape(buf,2342)==fmt_utf8(NULL,2342));
+  assert(fmt_xmlescape(buf,'&')==5 && byte_equal(buf,5,"&amp;"));
+  assert(fmt_xmlescape(buf,'<')==4 && byte_equal(buf,4,"&lt;"));
+  assert(fmt_xmlescape(buf,'\t')==1 && buf[0]==9);
+  assert(fmt_xmlescape(buf,8)==5 && byte_equal(buf,5,"&#x8;"));
+  return 0;
+}

test/httpd.c

@@ -1,12 +1,12 @@
-#include "socket.h"
-#include "io.h"
-#include "buffer.h"
-#include "ip6.h"
-#include "array.h"
-#include "case.h"
-#include "fmt.h"
-#include "iob.h"
-#include "str.h"
+#include <libowfat/socket.h>
+#include <libowfat/io.h>
+#include <libowfat/buffer.h>
+#include <libowfat/ip6.h>
+#include <libowfat/array.h>
+#include <libowfat/case.h>
+#include <libowfat/fmt.h>
+#include <libowfat/iob.h>
+#include <libowfat/str.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -276,7 +276,7 @@ emerge:
 	  } else if (array_bytes(&h->r)>8192) {
 	    httperror(h,"500 request too long","You sent too much headers");
 	    goto emerge;
-	  } else if ((l=header_complete(h)))
+	  } else if (header_complete(h))
 	    httpresponse(h,i);
 	}
       }

test/io.c

@@ -1,4 +1,4 @@
-#include "io.h"
+#include <libowfat/io.h>
 
 char buf[65536];
 int64 readpos = 0;

test/io2.c

@@ -1,4 +1,4 @@
-#include "io.h"
+#include <libowfat/io.h>
 
 char buf[65536];
 int64 readpos = 0;

test/io3.c

@@ -1,6 +1,6 @@
 #include <unistd.h>
-#include "buffer.h"
-#include "io.h"
+#include <libowfat/buffer.h>
+#include <libowfat/io.h>
 
 int main() {
   int64 pfd[2];

test/io4.c

@@ -1,5 +1,5 @@
-#include "io.h"
-#include "buffer.h"
+#include <libowfat/buffer.h>
+#include <libowfat/io.h>
 #include <unistd.h>
 
 int main() {

test/io5.c

@@ -1,7 +1,7 @@
-#include "socket.h"
-#include "io.h"
-#include "buffer.h"
-#include "ip6.h"
+#include <libowfat/socket.h>
+#include <libowfat/io.h>
+#include <libowfat/buffer.h>
+#include <libowfat/ip6.h>
 #include <errno.h>
 
 int main() {

test/iob.c

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "libowfat/iob.h"
+#include <libowfat/iob.h>
 #include <unistd.h>
 #include <string.h>
 

test/iom.c

@@ -1,4 +1,4 @@
-#include "libowfat/io.h"
+#include <libowfat/io.h>
 #include <stdio.h>
 #if !defined(PTHREAD) && (defined(__dietlibc__) || defined(__linux__))
 #define THRD

test/iombench.c

@@ -0,0 +1,127 @@
+#include <libowfat/io.h>
+#include <stdio.h>
+#if !defined(PTHREAD) && (defined(__dietlibc__) || defined(__linux__))
+#define THRD
+#include <threads.h>
+#else
+#include <pthread.h>
+#endif
+#include <unistd.h>
+#include <string.h>
+
+iomux_t c;
+
+int worker(void* arg) {
+  uintptr_t i=(uintptr_t)arg;
+  char buf[100];
+  int64 s;
+  unsigned int events;
+  int n=0;
+
+  for (;;) {
+    switch (iom_wait(&c,&s,&events,1000)) {
+    case -1:
+      perror("iom_wait");
+      return -1;
+    case 0:
+      write(1,buf,sprintf(buf,"timeout in thread %ld\n",i));
+      return 0;
+    case 1:
+      break;
+    }
+    switch (read(s,buf,1)) {
+    case -1:
+      perror("read");
+      return -1;
+    case 0:
+      return n;
+    }
+//    write(1,".",1);
+    ++n;
+    if (iom_requeue(&c,s,IOM_READ)==-1) {
+      perror("iom_requeue");
+      return 1;
+    }
+  }
+
+  return 0;
+}
+
+#ifndef THRD
+void* workerwrapper(void* arg) {
+  return (void*)(uintptr_t)worker(arg);
+}
+#endif
+
+enum { nfd=10, nthrd=4 };
+
+int main() {
+  int i;
+  int fd[2*nfd];
+  for (i=0; i<nfd; ++i) {
+    if (pipe(fd+i*2)==-1) {
+      perror("pipe");
+      return 111;
+    }
+  }
+  iom_init(&c);
+  for (i=0; i<nfd; ++i) {
+    if (iom_add(&c,fd[i*2],IOM_READ)==-1) {
+      perror("iom_add");
+      return 1;
+    }
+  }
+#ifdef THRD
+  thrd_t x[nthrd];
+#else
+  pthread_t x[nthrd];
+#endif
+  puts("launching threads");
+  for (i=0; i<nthrd; ++i)
+#ifdef THRD
+    if (thrd_create(&x[i],worker,(void*)(uintptr_t)i)==-1)
+#else
+    if (pthread_create(&x[i],0,workerwrapper,(void*)(uintptr_t)i)==-1)
+#endif
+    {
+      perror("thrd_create");
+      return 111;
+    }
+
+  // now write data to pipe
+  char spaces[512];
+  memset(spaces,' ',sizeof spaces);
+  for (i=0; i<1000; ++i) {
+    int j;
+    for (j=0; j<nfd; ++j) {
+      write(fd[j*2+1],spaces,sizeof spaces);
+    }
+  }
+  for (i=0; i<nfd; ++i)
+    close(fd[i*2+1]);
+//  sleep(1);
+//  iom_abort(&c);
+
+  puts("joining threads");
+  int r;
+  for (i=0; i<nthrd; ++i) {
+#ifdef THRD
+    if (thrd_join(x[i],&r)==-1)
+#else
+    void* tmp;
+    
+    if (pthread_join(x[i],&tmp)!=-1)
+      r=(int)(uintptr_t)tmp;
+    else
+#endif
+    {
+      perror("thrd_join");
+      return 111;
+    }
+    printf("thread %d returned %d\n",i,r);
+  }
+
+  fflush(stdout);
+
+  return 0;
+}

test/json.c

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <string.h>
-#include <textcode.h>
+#include <libowfat/textcode.h>
 
 int main() {
   char buf[100];

test/marshal.c

@@ -3,18 +3,18 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "fmt.h"
-#include "stralloc.h"
-#include "buffer.h"
-#include "scan.h"
-#include <textcode.h>
-#include <byte.h>
-#include <uint16.h>
-#include <uint32.h>
-#include <uint64.h>
-#include <openreadclose.h>
-#include <mmap.h>
-#include "str.h"
+#include <libowfat/fmt.h>
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
+#include <libowfat/scan.h>
+#include <libowfat/textcode.h>
+#include <libowfat/byte.h>
+#include <libowfat/uint16.h>
+#include <libowfat/uint32.h>
+#include <libowfat/uint64.h>
+#include <libowfat/openreadclose.h>
+#include <libowfat/mmap.h>
+#include <libowfat/str.h>
 
 char buf[100];
 stralloc sa;

test/mult.c

@@ -1,5 +1,5 @@
 #include <assert.h>
-#include "safemult.h"
+#include <libowfat/safemult.h>
 
 int main() {
   int16 a;

test/netstring.c

@@ -1,7 +1,8 @@
-#include "fmt.h"
-#include "scan.h"
+#include <libowfat/fmt.h>
+#include <libowfat/scan.h>
 #include <assert.h>
 #include <stdio.h>
+#include <string.h>
 
 int main() {
   char buf[100];

test/protobuf.c

@@ -1,5 +1,5 @@
-#include "fmt.h"
-#include "scan.h"
+#include <libowfat/fmt.h>
+#include <libowfat/scan.h>
 #include <math.h>
 #include <string.h>
 #include <assert.h>

test/proxy.c

@@ -1,12 +1,12 @@
-#include "socket.h"
-#include "io.h"
-#include "buffer.h"
-#include "ip6.h"
-#include "str.h"
-#include "dns.h"
+#include <libowfat/socket.h>
+#include <libowfat/io.h>
+#include <libowfat/buffer.h>
+#include <libowfat/ip6.h>
+#include <libowfat/str.h>
+#include <libowfat/dns.h>
 #include <errno.h>
 #include <getopt.h>
-#include "scan.h"
+#include <libowfat/scan.h>
 #include <stdlib.h>
 
 struct state {

test/range.c

@@ -1,4 +1,4 @@
-#include "rangecheck.h"
+#include <libowfat/rangecheck.h>
 #include <assert.h>
 #include <stdio.h>
 #include <inttypes.h>

test/readhttp.c

@@ -1,6 +1,6 @@
-#include "stralloc.h"
-#include "buffer.h"
-#include "byte.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
+#include <libowfat/byte.h>
 
 /* this demonstrates the buffer_get_token_sa_pred interface;
  * ishttp is the predicate that determines when buffer_get_token_sa_pred

test/scan.c

@@ -1,6 +1,6 @@
 #include <assert.h>
 #include <limits.h>
-#include "scan.h"
+#include <libowfat/scan.h>
 
 int main() {
   unsigned long l;

test/scan_long.c

@@ -1,6 +1,6 @@
-#include "scan.h"
-#include "fmt.h"
-#include "buffer.h"
+#include <libowfat/scan.h>
+#include <libowfat/fmt.h>
+#include <libowfat/buffer.h>
 #include <assert.h>
 
 int main() {

test/server.c

@@ -1,12 +1,12 @@
-#include "scan.h"
-#include "ip6.h"
-#include "str.h"
+#include <libowfat/scan.h>
+#include <libowfat/ip6.h>
+#include <libowfat/str.h>
 #include <errno.h>
 #include <string.h>
 #include <sys/poll.h>
 #include <unistd.h>
-#include "socket.h"
-#include "ndelay.h"
+#include <libowfat/socket.h>
+#include <libowfat/ndelay.h>
 #include <sys/socket.h>
 #ifdef __dietlibc__
 #include <write12.h>

test/stralloc_buffer.c

@@ -1,5 +1,5 @@
-#include "stralloc.h"
-#include "buffer.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
 
 int main() {
   static stralloc sa;

test/stralloc_chomp.c

@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "stralloc.h"
-#include "buffer.h"
+#include <libowfat/stralloc.h>
+#include <libowfat/buffer.h>
 
 int main() {
   static stralloc sa;

test/textcode.c

@@ -1,10 +1,9 @@
-#include "array.h"
-#include "textcode.h"
+#include <libowfat/array.h>
+#include <libowfat/textcode.h>
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
 #include <unistd.h>
-#include <write12.h>
 
 array a;
 

test/unurl.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "buffer.h"
-#include "textcode.h"
+#include <libowfat/buffer.h>
+#include <libowfat/textcode.h>
 #include "havealloca.h"
 #include <unistd.h>
 #include <stdio.h>

test/urlencode.c

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "buffer.h"
-#include "textcode.h"
+#include <libowfat/buffer.h>
+#include <libowfat/textcode.h>
 #include "havealloca.h"
 #include <unistd.h>
 

test/utf8.c

@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "scan.h"
-#include "fmt.h"
+#include <libowfat/scan.h>
+#include <libowfat/fmt.h>
 
 /* http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt */
 

test/uudecode.c

@@ -6,17 +6,16 @@
  * when decoding a part with broken crc. */
 #include <unistd.h>
 #include <stdint.h>
-#include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include "libowfat/textcode.h"
-#include "libowfat/str.h"
-#include "libowfat/buffer.h"
-#include "libowfat/open.h"
-#include "libowfat/stralloc.h"
-#include "libowfat/scan.h"
-#include "libowfat/case.h"
+#include <libowfat/textcode.h>
+#include <libowfat/str.h>
+#include <libowfat/buffer.h>
+#include <libowfat/open.h>
+#include <libowfat/stralloc.h>
+#include <libowfat/scan.h>
+#include <libowfat/case.h>
 
 static const uint32_t crc_table[256] = {
   0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,

test/vd.c

@@ -1,9 +1,8 @@
-#include "socket.h"
-#include "buffer.h"
+#include <libowfat/socket.h>
+#include <libowfat/buffer.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/uio.h>
-#include "ndelay.h"
 
 int main(int argc,char* argv[]) {
   int s=socket_tcp4b();