check-includes: allow redundant "config.h"

We should actually be including this (as it may define _GNU_SOURCE
etc) before any system headers.  But where we include <assert.h> we
often didn't, because check-includes would complain that the headers
included it too.

Weaken that check, and include config.h in C files before assert.h.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

bitcoin/block.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/block.h>
 #include <bitcoin/chainparams.h>

bitcoin/locktime.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/locktime.h>
 #include <ccan/tal/str/str.h>

bitcoin/psbt.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>

bitcoin/test/run-secret_eq_consttime.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/privkey.c>
 #include <ccan/err/err.h>

bitcoin/test/run-tx-encode.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/psbt.c>
 #include <bitcoin/shadouble.c>

bitcoin/tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/block.h>
 #include <bitcoin/chainparams.h>

bitcoin/tx_parts.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/tx_parts.h>
 #include <common/utils.h>

channeld/full_channel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/preimage.h>

common/amount.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <ccan/endian/endian.h>

common/bigsize.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <common/bigsize.h>
 #include <wire/wire.h>

common/coin_mvt.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/ccan/cast/cast.h>
 #include <ccan/tal/str/str.h>

common/cryptomsg.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/build_assert/build_assert.h>
 #include <ccan/crypto/hkdf_sha256/hkdf_sha256.h>

common/daemon.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <backtrace-supported.h>
 #include <backtrace.h>

common/dev_disconnect.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/err/err.h>
 #include <ccan/str/str.h>

common/gossip_store.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/crc32c/crc32c.h>
 #include <common/features.h>

common/gossmap.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/bitops/bitops.h>
 #include <ccan/crypto/siphash24/siphash24.h>

common/initial_channel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>

common/json.c

@@ -1,4 +1,5 @@
 /* JSON core and helpers */
+#include "config.h"
 #include <assert.h>
 #include <ccan/build_assert/build_assert.h>
 #include <ccan/json_escape/json_escape.h>

common/memleak.c

@@ -19,6 +19,7 @@
  * 3. provides a routine to access any remaining pointers in the
  *    table: these are the leaks.
  */
+#include "config.h"
 #include <assert.h>
 #include <backtrace.h>
 #include <ccan/crypto/siphash24/siphash24.h>

common/msg_queue.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <common/msg_queue.h>
 #include <common/utils.h>

common/node_id.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/array_size/array_size.h>
 #include <ccan/mem/mem.h>

common/penalty_base.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <common/penalty_base.h>
 #include <wire/wire.h>

common/per_peer_state.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/fdpass/fdpass.h>
 #include <common/gossip_constants.h>

common/private_channel_announcement.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/privkey.h>

common/read_peer_msg.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/fdpass/fdpass.h>
 #include <common/crypto_sync.h>

common/route.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/err/err.h>
 #include <ccan/tal/str/str.h>

common/setup.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/ccan/err/err.h>
 #include <common/memleak.h>

common/sphinx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 
 #include <ccan/array_size/array_size.h>

common/status.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/breakpoint/breakpoint.h>
 #include <ccan/endian/endian.h>

common/type_to_string.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/preimage.h>
 #include <ccan/crypto/ripemd160/ripemd160.h>

common/utxo.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/privkey.h>
 #include <bitcoin/psbt.h>

common/wireaddr.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <arpa/inet.h>
 #include <assert.h>
 #include <ccan/build_assert/build_assert.h>

connectd/handshake.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/privkey.h>
 #include <bitcoin/pubkey.h>

connectd/netaddress.c

@@ -1,4 +1,5 @@
 /* -*- c-basic-offset: 4; indent-tabs-mode: nil; -*- */
+#include "config.h"
 #include <arpa/inet.h>
 #include <assert.h>
 #include <common/status.h>

connectd/test/run-initiator-success.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdio.h>
 #include <sys/socket.h>

connectd/test/run-responder-success.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdio.h>
 #include <sys/socket.h>

connectd/tor_autoservice.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <arpa/inet.h>
 #include <assert.h>
 #include <ccan/err/err.h>

devtools/onion.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/mem/mem.h>
 #include <ccan/opt/opt.h>

devtools/topology.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/err/err.h>
 #include <ccan/opt/opt.h>

gossipd/test/run-bench-find_route.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/pubkey.h>
 #include <ccan/err/err.h>

plugins/spender/multifundchannel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/chainparams.h>
 #include <bitcoin/psbt.h>

plugins/spender/openchannel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/psbt.h>
 #include <ccan/ccan/array_size/array_size.h>

tests/fuzz/fuzz-amount.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdint.h>
 #include <tests/fuzz/libfuzz.h>

tests/fuzz/fuzz-base32-64.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>

tests/fuzz/fuzz-bigsize.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>

tests/fuzz/fuzz-bip32.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>

tests/fuzz/fuzz-channel_id.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <bitcoin/pubkey.h>
 #include <bitcoin/tx.h>

tests/fuzz/fuzz-close_tx.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <stdint.h>
 #include <string.h>

tests/fuzz/fuzz-hsm_encryption.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <tests/fuzz/libfuzz.h>
 

tests/fuzz/fuzz-initial_channel.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <fcntl.h>
 #include <stdint.h>

tools/check-includes.sh

@@ -40,7 +40,7 @@ for HEADER_FILE in $(filter_suffix h); do
     if [[ ! -e $C_FILE ]]; then
         continue
     fi
-    DUPLICATE_INCLUDES_IN_HEADER_AND_C_FILES=$(grep -hE "^#include " <(sort -u < "${HEADER_FILE}") <(sort -u < "${C_FILE}") | grep -E "^#include " | sort | uniq -d)
+    DUPLICATE_INCLUDES_IN_HEADER_AND_C_FILES=$(grep -hE "^#include " <(sort -u < "${HEADER_FILE}") <(sort -u < "${C_FILE}" | grep -v '"config.h"') | grep -E "^#include " | sort | uniq -d)
     if [[ ${DUPLICATE_INCLUDES_IN_HEADER_AND_C_FILES} != "" ]]; then
         echo "Include(s) from ${HEADER_FILE} duplicated in ${C_FILE}:"
         echo "${DUPLICATE_INCLUDES_IN_HEADER_AND_C_FILES}"

wire/tlvstream.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <common/bigsize.h>
 #include <wire/tlvstream.h>

wire/wire_sync.c

@@ -1,3 +1,4 @@
+#include "config.h"
 #include <assert.h>
 #include <ccan/endian/endian.h>
 #include <ccan/read_write_all/read_write_all.h>