Add directory to all includes.

diff --git a/lib/Makefile b/lib/Makefile
index 037020913bdcad50eefe11ff5662ae583d0db447..af8fb34818af3366613c87f1b89c98748e8d2b03 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -6,7 +6,7 @@ PROGS+=obj/lib/db-test obj/lib/db-rebuild
 SHLIB_OBJS=alloc.o alloc_str.o ctmatch.o db.o fastbuf.o fb-file.o fb-mem.o lists.o \
        log.o log2.o md5.o md5hex.o mmap.o pagecache.o patimatch.o patmatch.o pool.o \
        prime.o random.o realloc.o regex.o temp.o timer.o url.o wildmatch.o \
-       wordsplit.o
+       wordsplit.o str_ctype.o str_upper.o
 
 obj/lib/libsh.a: $(addprefix obj/lib/,$(SHLIB_OBJS))
 

diff --git a/lib/alloc.c b/lib/alloc.c
index c72851eec33c7cf4eebdb27e9ff6c9421aabff5b..127e63cabfcd4ead9b62e5d4206b3e4aa63aee1f 100644 (file)
--- a/lib/alloc.c
+++ b/lib/alloc.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 void *
 xmalloc(uns size)

diff --git a/lib/alloc_str.c b/lib/alloc_str.c
index 7c9f92decdd999db49583c782ae8c240953f0d2d..0153887e252bcd001a633d7ff5f98e70e626914a 100644 (file)
--- a/lib/alloc_str.c
+++ b/lib/alloc_str.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 byte *
 stralloc(byte *s)

diff --git a/lib/ctmatch.c b/lib/ctmatch.c
index ffa1385cdd878e54c81adecc41517ebad06c4467..269ab83df1d8121e3383c7e55db8d0ab05033248 100644 (file)
--- a/lib/ctmatch.c
+++ b/lib/ctmatch.c
@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 
-#include "lib.h"
-#include "string.h"
+#include "lib/lib.h"
+#include "lib/chartype.h"
 
 int
 match_ct_patt(byte *p, byte *t)

diff --git a/lib/db-emul.c b/lib/db-emul.c
index 533c996f156e2d4e8b572181f59ef66d43269b25..f6cc65ca5f06895460a8b82f0d655f88b724dab7 100644 (file)
--- a/lib/db-emul.c
+++ b/lib/db-emul.c
@@ -8,8 +8,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lib.h"
-#include "db.h"
+#include "lib/lib.h"
+#include "lib/db.h"
 
 #include <gdbm.h>
 

diff --git a/lib/db-rebuild.c b/lib/db-rebuild.c
index a0ad1585b11cf56b96d75d7623e794dec7e3a12f..3ab673fcdaedc8126a6647e1ae1d5062c577c9ba 100644 (file)
--- a/lib/db-rebuild.c
+++ b/lib/db-rebuild.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <errno.h>
 
-#include "db.c"
+#include "lib/db.c"
 
 int
 main(int argc, char **argv)

diff --git a/lib/db-test.c b/lib/db-test.c
index b1694223e99f12114a97162acfddd70c1ca72559..99139eb30d96c54a1e06a619f005fa8e5958efd6 100644 (file)
--- a/lib/db-test.c
+++ b/lib/db-test.c
@@ -5,10 +5,10 @@
  */
 
 #if 1
-#include "db.c"
+#include "lib/db.c"
 #define NAME "SDBM"
 #else
-#include "db-emul.c"
+#include "lib/db-emul.c"
 #define NAME "GDBM"
 #endif
 

diff --git a/lib/db.c b/lib/db.c
index fd8a8c0e25b4808f2162173c817531fb43c24e3f..c33ca6f54768ea6ac5eff8944e5c97d768ff8cb7 100644 (file)
--- a/lib/db.c
+++ b/lib/db.c
@@ -25,11 +25,11 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib.h"
-#include "lfs.h"
-#include "pagecache.h"
-#include "db.h"
-#include "db_internal.h"
+#include "lib/lib.h"
+#include "lib/lfs.h"
+#include "lib/pagecache.h"
+#include "lib/db.h"
+#include "lib/db_internal.h"
 
 struct sdbm *
 sdbm_open(struct sdbm_options *o)

diff --git a/lib/fastbuf.c b/lib/fastbuf.c
index 1a5544fb59b4ed918bd3ce72d1ada4827e83f49a..42506f763e385715028bf973b2eade7d30dcf74d 100644 (file)
--- a/lib/fastbuf.c
+++ b/lib/fastbuf.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
-#include "fastbuf.h"
+#include "lib/lib.h"
+#include "lib/fastbuf.h"
 
 void bclose(struct fastbuf *f)
 {

diff --git a/lib/fb-file.c b/lib/fb-file.c
index c111ab75a86a26d8d4901ff1fa8dc69ef8504dc4..07b4ec5ddf2d5f79343c979468d60053717724f2 100644 (file)
--- a/lib/fb-file.c
+++ b/lib/fb-file.c
@@ -9,9 +9,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib.h"
-#include "fastbuf.h"
-#include "lfs.h"
+#include "lib/lib.h"
+#include "lib/fastbuf.h"
+#include "lib/lfs.h"
 
 static int
 bfd_refill(struct fastbuf *f)

diff --git a/lib/fb-mem.c b/lib/fb-mem.c
index 4248c2fdb19ec42180d21baaf1762a78ce580490..f582e2e3f9cc5f4a733a9f756a693ed20d1b9043 100644 (file)
--- a/lib/fb-mem.c
+++ b/lib/fb-mem.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
-#include "fastbuf.h"
+#include "lib/lib.h"
+#include "lib/fastbuf.h"
 
 struct memstream {
   unsigned blocksize;

diff --git a/lib/lib.h b/lib/lib.h
index 72337d93ea93b5118cd0aa180ce06ab174b1540d..48d49ec9a9aa532fd065362a945f6bc0d3dca926 100644 (file)
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -7,7 +7,7 @@
 #ifndef _SHERLOCK_LIB_H
 #define _SHERLOCK_LIB_H
 
-#include <lib/config.h>
+#include "lib/config.h"
 
 /* Ugly structure handling macros */
 

diff --git a/lib/lists.c b/lib/lists.c
index 8f4f0b4bc97bb5c7313db9b1de7674b923ef4069..9f783de9daf03d0e60d972c219cecc1be7e5bec7 100644 (file)
--- a/lib/lists.c
+++ b/lib/lists.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 
 #define _SHERLOCK_LISTS_C
-#include "lists.h"
+#include "lib/lists.h"
 
 LIST_INLINE void
 add_tail(list *l, node *n)

diff --git a/lib/lists.h b/lib/lists.h
index 48b7de99c0dd01c58d2ef15125c1bd38b8c269a3..ce03656b10bc7eedc00d9ef5586ad9b0b1a0e34d 100644 (file)
--- a/lib/lists.h
+++ b/lib/lists.h
@@ -38,7 +38,7 @@ void init_list(list *);
 void insert_node(node *, node *);
 
 #if !defined(_SHERLOCK_LISTS_C) && defined(__GNUC__)
-#define LIST_INLINE extern inline
+#define LIST_INLINE static inline
 #include "lib/lists.c"
 #undef LIST_INLINE
 #else

diff --git a/lib/log.c b/lib/log.c
index 78d5089f496cd20424dff62aef650e884dbd91d6..994522dcf6aea825777c233cba7926b3c2558d17 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -11,7 +11,7 @@
 #include <unistd.h>
 #include <sys/time.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 static byte *progname = "???";
 static pid_t pid;

diff --git a/lib/log2.c b/lib/log2.c
index 5ba257765f0690af4c4f4c2eb8c3633c25370bdb..da6cf8ec9f991bfb5ace50a901765e5c9924a02e 100644 (file)
--- a/lib/log2.c
+++ b/lib/log2.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #undef log2
 

diff --git a/lib/md5.c b/lib/md5.c
index d4f8535b3164c83b2851fa39296bc3e54b9fd200..32d2602020395b0d28e8c7b4940328118f02a2af 100644 (file)
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -16,7 +16,7 @@
  */
 
 #include <string.h>            /* for memcpy() */
-#include "md5.h"
+#include "lib/md5.h"
 
 #ifndef HIGHFIRST
 #define byteReverse(buf, len)  /* Nothing */

diff --git a/lib/md5hex.c b/lib/md5hex.c
index 143168db92fdff7022c999b6caa418edb02658b0..2b8d2d88d0ecb380ab6bd1a0117cdb152290aba1 100644 (file)
--- a/lib/md5hex.c
+++ b/lib/md5hex.c
@@ -9,8 +9,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib.h"
-#include "string.h"
+#include "lib/lib.h"
+#include "lib/chartype.h"
 
 void
 md5_to_hex(byte *s, byte *d)

diff --git a/lib/mmap.c b/lib/mmap.c
index 23f69e6e36319d44426303435a9489a554f955fc..46f5cd3add76ef0b9d8643fe415fdd45076eca34 100644 (file)
--- a/lib/mmap.c
+++ b/lib/mmap.c
@@ -10,7 +10,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #ifndef MAP_FAILED
 #define MAP_FAILED ((void *)-1L)

diff --git a/lib/pagecache.c b/lib/pagecache.c
index f194fc5cb838901dc0a9b13b7c42487b90a6ba3e..9420ab3128a21c229c7eed6a52f19bbe9550e929 100644 (file)
--- a/lib/pagecache.c
+++ b/lib/pagecache.c
@@ -10,9 +10,9 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib.h"
-#include "pagecache.h"
-#include "lfs.h"
+#include "lib/lib.h"
+#include "lib/pagecache.h"
+#include "lib/lfs.h"
 
 struct page_cache {
   list free_pages;                     /* LRU queue of free non-dirty pages */

diff --git a/lib/patimatch.c b/lib/patimatch.c
index fa651b06dda3acfb52ba9ed6cddb3130e811f9cb..e799f6947455fecce1a41bb4f39b9c0e5014dc27 100644 (file)
--- a/lib/patimatch.c
+++ b/lib/patimatch.c
@@ -7,10 +7,10 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lib.h"
-#include "string.h"
+#include "lib/lib.h"
+#include "lib/chartype.h"
 
 #define Convert(x) Cupcase(x)
 #define MATCH_FUNC_NAME match_pattern_nocase
 
-#include "patmatch.h"
+#include "lib/patmatch.h"

diff --git a/lib/patmatch.c b/lib/patmatch.c
index 53a0710a2a46b4ae357cc1861bfa1c64fe1416bd..df73de57696babca58acecb32e763991e591ee94 100644 (file)
--- a/lib/patmatch.c
+++ b/lib/patmatch.c
@@ -7,9 +7,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #define Convert(x) (x)
 #define MATCH_FUNC_NAME match_pattern
 
-#include "patmatch.h"
+#include "lib/patmatch.h"

diff --git a/lib/pool.c b/lib/pool.c
index 7fc635d37cf11aa2a8df98ed934f08153f614954..623f0517490e09c8e57bddc40b49e7f9578ec8d2 100644 (file)
--- a/lib/pool.c
+++ b/lib/pool.c
@@ -7,8 +7,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
-#include "pools.h"
+#include "lib/lib.h"
+#include "lib/pools.h"
 
 struct memchunk {
   struct memchunk *next;

diff --git a/lib/prime.c b/lib/prime.c
index fe47ecd3472290ab87203f496e9adcd049e65698..877442dad8dfa973df4dfb1522413b5becf8da0c 100644 (file)
--- a/lib/prime.c
+++ b/lib/prime.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 static int                             /* Sequential search */
 __isprime(uns x)                       /* We know x != 2 && x != 3 */

diff --git a/lib/random.c b/lib/random.c
index 01adda5b0137ecbe06de7439db3848369b179348..57516fd2f89bae94afa1d079e558c4f65987c685 100644 (file)
--- a/lib/random.c
+++ b/lib/random.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 uns
 random_max(uns max)

diff --git a/lib/realloc.c b/lib/realloc.c
index 78c6b19b9cfa204178b5c797a397f4fb825a9446..3ee75aa8c3caeb983259c43b1ff19bf785e60cf5 100644 (file)
--- a/lib/realloc.c
+++ b/lib/realloc.c
@@ -7,7 +7,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 void *
 xrealloc(void *old, uns size)

diff --git a/lib/regex.c b/lib/regex.c
index 888f36b918bb4a422f234647ae891596674f936a..2df8fd043027e421c1c2eaaca86ad873656db83d 100644 (file)
--- a/lib/regex.c
+++ b/lib/regex.c
@@ -9,7 +9,7 @@
 #include <stdlib.h>
 #include <regex.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 #define INITIAL_MEM 1024               /* Initial space allocated for each pattern */
 

diff --git a/lib/str_ctype.c b/lib/str_ctype.c
index 773d78436f1ef30b6316900f5a990f0ae973e8f3..45d7191d94c30230a73d61a376f9bbc7abdb483c 100644 (file)
--- a/lib/str_ctype.c
+++ b/lib/str_ctype.c
@@ -4,10 +4,10 @@
  *     (c) 1998 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "string.h"
+#include "lib/chartype.h"
 
 unsigned char _c_cat[256] = {
 #define CHAR(code,upper,unacc,acc,cat) cat,
-#include "charmap.h"
+#include "lib/charmap.h"
 #undef CHAR
 };

diff --git a/lib/str_upper.c b/lib/str_upper.c
index 2742cd4a82e72f449bb3455987732b8e05435bf7..fa99e3660cea30ead1a54dccbfebafba9a10a84c 100644 (file)
--- a/lib/str_upper.c
+++ b/lib/str_upper.c
@@ -4,10 +4,10 @@
  *     (c) 1997 Martin Mares, <mj@atrey.karlin.mff.cuni.cz>
  */
 
-#include "string.h"
+#include "lib/chartype.h"
 
 unsigned char _c_upper[256] = {
 #define CHAR(code,upper,unacc,acc,cat) upper,
-#include "charmap.h"
+#include "lib/charmap.h"
 #undef CHAR
 };

diff --git a/lib/temp.c b/lib/temp.c
index 0b754c104f772153bef1de7077852831014e5a01..175977e9c8151d52ac2ea841a17196bdb865b414 100644 (file)
--- a/lib/temp.c
+++ b/lib/temp.c
@@ -9,7 +9,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 u32
 temprand(uns key)

diff --git a/lib/timer.c b/lib/timer.c
index 7a18583b9d728658d1d06d7e09ea72718876dd5b..802945187c4b2fbd0582924117fa2e00fbea13b6 100644 (file)
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <sys/time.h>
 
-#include "lib.h"
+#include "lib/lib.h"
 
 static struct timeval last_tv;
 

diff --git a/lib/url.c b/lib/url.c
index 480ba1807ed5b69f756209511196da123818643f..e3f431ad4c61dc825a39095d3cdc59a27eb57ba3 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include "lib.h"
-#include "url.h"
-#include "string.h"
+#include "lib/lib.h"
+#include "lib/url.h"
+#include "lib/chartype.h"
 
 /* Escaping and de-escaping */
 

diff --git a/lib/wildmatch.c b/lib/wildmatch.c
index fbc9bdb3c547e33587b1fe674aab007f15affe7e..9bccae19f158333e53ddb3fb9754982463a7950c 100644 (file)
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "lib.h"
-#include "pools.h"
-#include "wildmatch.h"
+#include "lib/lib.h"
+#include "lib/pools.h"
+#include "lib/wildmatch.h"
 
 #define MAX_STATES 32          /* Must be <= 32, state 0 is reserved, state 1 is initial */
 #define MAX_CACHED 256         /* Maximum number of cached DFA states */

diff --git a/lib/wordsplit.c b/lib/wordsplit.c
index fe657fc729387b0ce623b395f18e86f235caf442..e79812d18a7bd352ed3bb6a045fdf98745abbd29 100644 (file)
--- a/lib/wordsplit.c
+++ b/lib/wordsplit.c
@@ -6,8 +6,8 @@
 
 #include <stdio.h>
 
-#include "lib.h"
-#include "string.h"
+#include "lib/lib.h"
+#include "lib/chartype.h"
 
 int
 wordsplit(byte *src, byte **dst, uns max)