Normalize .may_include to always have paths, and paths to include

diff --git a/src/lib/container/.may_include b/src/lib/container/.may_include
index 76e58437287075246bcfb58867d5a305fe77b544..81507527d3299f72d8ddfa8f5f97d597a1ffe224 100644 (file)
--- a/src/lib/container/.may_include
+++ b/src/lib/container/.may_include
@@ -7,9 +7,9 @@ lib/malloc/*.h
 lib/err/*.h
 lib/smartlist_core/*.h
 lib/string/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h
 lib/intmath/*.h
 lib/log/*.h
 
-ht.h
-siphash.h
+ext/ht.h
+ext/siphash.h

diff --git a/src/lib/container/bloomfilt.c b/src/lib/container/bloomfilt.c
index ea2d2917c77c2187cb7914fd698022ea38a4768a..a64fcb9300b94da17fc2b8c001b9d0d467dfb9be 100644 (file)
--- a/src/lib/container/bloomfilt.c
+++ b/src/lib/container/bloomfilt.c
@@ -14,7 +14,7 @@
 #include "lib/container/bloomfilt.h"
 #include "lib/intmath/bits.h"
 #include "lib/log/util_bug.h"
-#include "siphash.h"
+#include "ext/siphash.h"
 
 /** How many bloom-filter bits we set per address. This is twice the
  * BLOOMFILT_N_HASHES value, since we split the siphash output into two 32-bit

diff --git a/src/lib/container/map.c b/src/lib/container/map.c
index 85e074e10a20b6a25da8ff4e78d8dd6f07ef3774..137e316920516f47b3bcc4a449556ad07c113428 100644 (file)
--- a/src/lib/container/map.c
+++ b/src/lib/container/map.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "ht.h"
+#include "ext/ht.h"
 
 /** Helper: Declare an entry type and a map type to implement a mapping using
  * ht.h.  The map type will be called <b>maptype</b>.  The key part of each

diff --git a/src/lib/container/map.h b/src/lib/container/map.h
index ff71622682fed52fa4d893208d38e9bbacc25779..4f427fe767da8a4d9b578b1c596699651e880b1e 100644 (file)
--- a/src/lib/container/map.h
+++ b/src/lib/container/map.h
@@ -15,7 +15,7 @@
 #include "lib/testsupport/testsupport.h"
 #include "lib/cc/torint.h"
 
-#include "siphash.h"
+#include "ext/siphash.h"
 
 #define DECLARE_MAP_FNS(maptype, keytype, prefix)                       \
   typedef struct maptype maptype;                                       \

diff --git a/src/lib/crypt_ops/.may_include b/src/lib/crypt_ops/.may_include
index 352fde858cc89acb7819d675cd4fec8f92237b0a..0739699686d471e88ff05bc7c8769fed37881a76 100644 (file)
--- a/src/lib/crypt_ops/.may_include
+++ b/src/lib/crypt_ops/.may_include
@@ -13,7 +13,7 @@ lib/intmath/*.h
 lib/sandbox/*.h
 lib/string/*.h
 lib/subsys/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h
 lib/thread/*.h
 lib/log/*.h
 
@@ -22,4 +22,4 @@ trunnel/pwbox.h
 keccak-tiny/*.h
 ed25519/*.h
 
-siphash.h
+ext/siphash.h

diff --git a/src/lib/crypt_ops/crypto_init.c b/src/lib/crypt_ops/crypto_init.c
index 4c4cc3e43b4babeac4a8f3106424696a4e24f4fc..f9943939fb1d79103351dc61f4307450f0c14e8c 100644 (file)
--- a/src/lib/crypt_ops/crypto_init.c
+++ b/src/lib/crypt_ops/crypto_init.c
@@ -24,7 +24,7 @@
 
 #include "lib/subsys/subsys.h"
 
-#include "siphash.h"
+#include "ext/siphash.h"
 
 /** Boolean: has our crypto library been initialized? (early phase) */
 static int crypto_early_initialized_ = 0;

diff --git a/src/lib/crypt_ops/digestset.c b/src/lib/crypt_ops/digestset.c
index 89dd377a9c544498e034ba907706f2c7a03f0f08..84516e0172ec99dacf6622700f54869c76c072d1 100644 (file)
--- a/src/lib/crypt_ops/digestset.c
+++ b/src/lib/crypt_ops/digestset.c
@@ -11,7 +11,7 @@
 #include "lib/crypt_ops/crypto_rand.h"
 #include "lib/defs/digest_sizes.h"
 #include "lib/crypt_ops/digestset.h"
-#include "siphash.h"
+#include "ext/siphash.h"
 
 /* Wrap our hash function to have the signature that the bloom filter
  * needs. */

diff --git a/src/lib/evloop/.may_include b/src/lib/evloop/.may_include
index 30af508914421d3ddb4d17343c10e350901cf41b..273de7bb9434e7acb43d764f3b0557d3723f0258 100644 (file)
--- a/src/lib/evloop/.may_include
+++ b/src/lib/evloop/.may_include
@@ -12,5 +12,5 @@ lib/testsupport/*.h
 lib/thread/*.h
 lib/time/*.h
 
-src/ext/timeouts/timeout.c
-tor_queue.h
\ No newline at end of file
+ext/timeouts/timeout.c
+ext/tor_queue.h
\ No newline at end of file

diff --git a/src/lib/evloop/timers.c b/src/lib/evloop/timers.c
index 3603bf1a7d6684f08b9db56414f34a74722d338e..6743b6af514c9a5dd8cd7d39f5a35c76a2831b06 100644 (file)
--- a/src/lib/evloop/timers.c
+++ b/src/lib/evloop/timers.c
@@ -80,7 +80,8 @@ struct timeout_cb {
  * use 32-bit math. */
 #define WHEEL_BIT 5
 #endif
-#include "src/ext/timeouts/timeout.c"
+
+#include "ext/timeouts/timeout.c"
 
 static struct timeouts *global_timeouts = NULL;
 static struct mainloop_event_t *global_timer_event = NULL;

diff --git a/src/lib/evloop/workqueue.c b/src/lib/evloop/workqueue.c
index 5471f87b046c516fd58c7e22dd53375482082cfb..b36a02da5e716a3f701fb7a7b25bdd2e45e923fa 100644 (file)
--- a/src/lib/evloop/workqueue.c
+++ b/src/lib/evloop/workqueue.c
@@ -36,7 +36,7 @@
 #include "lib/net/socket.h"
 #include "lib/thread/threads.h"
 
-#include "tor_queue.h"
+#include "ext/tor_queue.h"
 #include <event2/event.h>
 #include <string.h>
 

diff --git a/src/lib/fs/.may_include b/src/lib/fs/.may_include
index b1e49fc89132d4ac5c0d36e496e354cca64c67b5..c192e6181c72a8410adcdc0b8ef703981777d8ef 100644 (file)
--- a/src/lib/fs/.may_include
+++ b/src/lib/fs/.may_include
@@ -13,4 +13,4 @@ lib/malloc/*.h
 lib/memarea/*.h
 lib/sandbox/*.h
 lib/string/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h

diff --git a/src/lib/malloc/.may_include b/src/lib/malloc/.may_include
index cc62bb10130c19f0dd7698bab7e10a03c4c8b4f3..7686bf862adb01dc9e53aab832a235b6e6ed88d5 100644 (file)
--- a/src/lib/malloc/.may_include
+++ b/src/lib/malloc/.may_include
@@ -3,4 +3,4 @@ orconfig.h
 lib/cc/*.h
 lib/err/*.h
 lib/malloc/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h

diff --git a/src/lib/net/.may_include b/src/lib/net/.may_include
index d34aaed2ca37c9afb02d22c6829558551de56321..e4368f799bc08b560a9bf30bbff3d487c3fc7bf2 100644 (file)
--- a/src/lib/net/.may_include
+++ b/src/lib/net/.may_include
@@ -1,6 +1,6 @@
 orconfig.h
-siphash.h
-ht.h
+ext/siphash.h
+ext/ht.h
 
 lib/arch/*.h
 lib/buf/*.h

diff --git a/src/lib/net/address.c b/src/lib/net/address.c
index a351b9df28fa9308f8d59eac48fae645a1364789..240201d7b60e511f5951e0c0c1ff1d51866f41b6 100644 (file)
--- a/src/lib/net/address.c
+++ b/src/lib/net/address.c
@@ -53,7 +53,7 @@
 #include "lib/string/printf.h"
 #include "lib/string/util_string.h"
 
-#include "siphash.h"
+#include "ext/siphash.h"
 
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>

diff --git a/src/lib/net/resolve.c b/src/lib/net/resolve.c
index 7c8df3e3077e39802c02e1f108e4149dd4312cbd..01f78829647872f3e8b7ea32ae4d7e4f8913e19d 100644 (file)
--- a/src/lib/net/resolve.c
+++ b/src/lib/net/resolve.c
@@ -16,8 +16,8 @@
 #include "lib/string/parse_int.h"
 #include "lib/string/util_string.h"
 
-#include "siphash.h"
-#include "ht.h"
+#include "ext/siphash.h"
+#include "ext/ht.h"
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

diff --git a/src/lib/process/.may_include b/src/lib/process/.may_include
index a2d57a52f30226aa2bea53a52f9091d6bd78c768..3a5d849fe7b87dd572812058c3a4c9b57729b22e 100644 (file)
--- a/src/lib/process/.may_include
+++ b/src/lib/process/.may_include
@@ -15,4 +15,4 @@ lib/subsys/*.h
 lib/testsupport/*.h
 lib/thread/*.h
 
-ht.h
\ No newline at end of file
+ext/ht.h
\ No newline at end of file

diff --git a/src/lib/process/waitpid.c b/src/lib/process/waitpid.c
index 32ba4530dac86b9f92b45d613ff2ded9e7544379..46d30bf50ecd06340580bade7c2831d8a91933bb 100644 (file)
--- a/src/lib/process/waitpid.c
+++ b/src/lib/process/waitpid.c
@@ -16,7 +16,7 @@
 #include "lib/log/log.h"
 #include "lib/log/util_bug.h"
 #include "lib/malloc/malloc.h"
-#include "ht.h"
+#include "ext/ht.h"
 
 #ifdef HAVE_SYS_WAIT_H
 #include <sys/wait.h>

diff --git a/src/lib/sandbox/.may_include b/src/lib/sandbox/.may_include
index e8ba5bb73c94e152e711580229c28d3f2376922b..853dae78808057eaf7f60271a2f878c84197cb13 100644 (file)
--- a/src/lib/sandbox/.may_include
+++ b/src/lib/sandbox/.may_include
@@ -9,6 +9,6 @@ lib/sandbox/*.h
 lib/sandbox/*.inc
 lib/string/*.h
 
-ht.h
-siphash.h
-tor_queue.h
+ext/ht.h
+ext/siphash.h
+ext/tor_queue.h

diff --git a/src/lib/sandbox/sandbox.c b/src/lib/sandbox/sandbox.c
index 4d832f106db562006e96329fe81c8f9925c13ccc..9477818553f912c1c72edbcb936bd64bc565e543 100644 (file)
--- a/src/lib/sandbox/sandbox.c
+++ b/src/lib/sandbox/sandbox.c
@@ -41,9 +41,9 @@
 #include "lib/malloc/malloc.h"
 #include "lib/string/scanf.h"
 
-#include "tor_queue.h"
-#include "ht.h"
-#include "siphash.h"
+#include "ext/tor_queue.h"
+#include "ext/ht.h"
+#include "ext/siphash.h"
 
 #define DEBUGGING_CLOSE
 

diff --git a/src/lib/smartlist_core/.may_include b/src/lib/smartlist_core/.may_include
index a8507761a4f966a3aa7eda77a90a18156da98dba..2f0c8d341e16db2cf4767f90ac730280c54efb23 100644 (file)
--- a/src/lib/smartlist_core/.may_include
+++ b/src/lib/smartlist_core/.may_include
@@ -4,4 +4,4 @@ lib/malloc/*.h
 lib/err/*.h
 lib/string/*.h
 lib/smartlist_core/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h

diff --git a/src/lib/string/.may_include b/src/lib/string/.may_include
index ec5c76983100d62b339db300ad294e0907557619..1fb9127f19bc82d1ee44505461a08086419c8881 100644 (file)
--- a/src/lib/string/.may_include
+++ b/src/lib/string/.may_include
@@ -6,5 +6,5 @@ lib/malloc/*.h
 lib/ctime/*.h
 lib/string/*.h
 
-strlcat.c
-strlcpy.c
+ext/strlcat.c
+ext/strlcpy.c

diff --git a/src/lib/string/compat_string.c b/src/lib/string/compat_string.c
index eae82fdae040d0fa8dbf964bbd4ed79c7d6b1353..b3f1e0fd968fd8b7ad6b37ef2e7c412f42ea9d4e 100644 (file)
--- a/src/lib/string/compat_string.c
+++ b/src/lib/string/compat_string.c
@@ -14,10 +14,10 @@
 
 /* Inline the strl functions if the platform doesn't have them. */
 #ifndef HAVE_STRLCPY
-#include "strlcpy.c"
+#include "ext/strlcpy.c"
 #endif
 #ifndef HAVE_STRLCAT
-#include "strlcat.c"
+#include "ext/strlcat.c"
 #endif
 
 #include <stdlib.h>

diff --git a/src/lib/term/.may_include b/src/lib/term/.may_include
index c93a06e59efcfcef05c2f13a8ed55b6cbdcb7b43..306fa57b7a383ff19fbbc15acf8bc13d60d3bda8 100644 (file)
--- a/src/lib/term/.may_include
+++ b/src/lib/term/.may_include
@@ -5,5 +5,4 @@ lib/log/*.h
 lib/term/*.h
 lib/malloc/*.h
 
-# From src/ext
-tor_readpassphrase.h
+ext/tor_readpassphrase.h

diff --git a/src/lib/term/getpass.c b/src/lib/term/getpass.c
index 27a27179b6656000ae2d0bd0ee2395a1c6254a25..a473fb765b53d469596c370e802d7655d6ec0016 100644 (file)
--- a/src/lib/term/getpass.c
+++ b/src/lib/term/getpass.c
@@ -36,7 +36,7 @@ SecureZeroMemory(PVOID ptr, SIZE_T cnt)
 #elif defined(HAVE_READPASSPHRASE_H)
 #include <readpassphrase.h>
 #else
-#include "tor_readpassphrase.h"
+#include "ext/tor_readpassphrase.h"
 #endif /* defined(_WIN32) || ... */
 
 #include <stdlib.h>

diff --git a/src/lib/tls/.may_include b/src/lib/tls/.may_include
index 069181b70e8c83f5a5ffca72a198851b5f65dbe1..c550bde024de1ec059dd582d2ff9b08ab95724ba 100644 (file)
--- a/src/lib/tls/.may_include
+++ b/src/lib/tls/.may_include
@@ -13,7 +13,6 @@ lib/malloc/*.h
 lib/net/*.h
 lib/string/*.h
 lib/subsys/*.h
-lib/testsupport/testsupport.h
+lib/testsupport/*.h
 lib/tls/*.h
-
-ciphers.inc
+lib/tls/*.inc

diff --git a/src/lib/tls/tortls_openssl.c b/src/lib/tls/tortls_openssl.c
index 63f6259a6c759eb775332cdf23b057864ce28875..ddeaabc4162b42c56af640e94eadae1775f3cb14 100644 (file)
--- a/src/lib/tls/tortls_openssl.c
+++ b/src/lib/tls/tortls_openssl.c
@@ -461,7 +461,7 @@ static const char UNRESTRICTED_SERVER_CIPHER_LIST[] =
 /** List of ciphers that clients should advertise, omitting items that
  * our OpenSSL doesn't know about. */
 static const char CLIENT_CIPHER_LIST[] =
-#include "ciphers.inc"
+#include "lib/tls/ciphers.inc"
   /* Tell it not to use SSLv2 ciphers, so that it can select an SSLv3 version
    * of any cipher we say. */
   "!SSLv2"