Switch to fully-qualified #include

Previously, mosh used extensive -I flags and all of the mosh-local makes it really hard to tell what the proper dependency graph is, so instead remove the -I arguments in favvor of $(top_srcdir) and qualify the paths wherever they are used.
achernya · Jul 30, 2023 · 39f6781 · 39f6781
1 parent c4aed05
commit 39f6781
Show file tree

Hide file tree

Showing 75 changed files with 177 additions and 177 deletions.
diff --git a/src/crypto/Makefile.am b/src/crypto/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../util $(CRYPTO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(CRYPTO_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 
 noinst_LIBRARIES = libmoshcrypto.a

diff --git a/src/crypto/base64.cc b/src/crypto/base64.cc
@@ -33,8 +33,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "fatal_assert.h"
-#include "base64.h"
+#include "src/util/fatal_assert.h"
+#include "src/crypto/base64.h"
 
 static const char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 

diff --git a/src/crypto/byteorder.h b/src/crypto/byteorder.h
@@ -33,7 +33,7 @@
 #ifndef BYTEORDER_HPP
 #define BYTEORDER_HPP
 
-#include "config.h"
+#include "src/include/config.h"
 
 #if HAVE_DECL_BE64TOH || HAVE_DECL_BETOH64
 

diff --git a/src/crypto/crypto.cc b/src/crypto/crypto.cc
@@ -38,11 +38,11 @@
 #include <sys/resource.h>
 #include <fstream>
 
-#include "byteorder.h"
-#include "crypto.h"
-#include "base64.h"
-#include "fatal_assert.h"
-#include "prng.h"
+#include "src/crypto/byteorder.h"
+#include "src/crypto/crypto.h"
+#include "src/crypto/base64.h"
+#include "src/util/fatal_assert.h"
+#include "src/crypto/prng.h"
 
 using namespace Crypto;
 

diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
@@ -33,7 +33,7 @@
 #ifndef CRYPTO_HPP
 #define CRYPTO_HPP
 
-#include "ae.h"
+#include "src/crypto/ae.h"
 #include <string>
 #include <string.h>
 #include <stdint.h>

diff --git a/src/crypto/ocb_internal.cc b/src/crypto/ocb_internal.cc
@@ -24,7 +24,7 @@
 / Comments are welcome: Ted Krovetz <ted@krovetz.net> - Dedicated to Laurel K
 /------------------------------------------------------------------------- */
 
-#include "config.h"
+#include "src/include/config.h"
 
 /* This module implements the ae.h interface for OpenSSL, Apple Common
 /  Crypto, and Nettle.                                                     */
@@ -84,9 +84,9 @@
 /* Includes and compiler specific definitions                              */
 /* ----------------------------------------------------------------------- */
 
-#include "ae.h"
-#include "crypto.h"
-#include "fatal_assert.h"
+#include "src/crypto/ae.h"
+#include "src/crypto/crypto.h"
+#include "src/util/fatal_assert.h"
 #include <stdlib.h>
 #include <string.h>
 #if defined(HAVE_STRINGS_H)

diff --git a/src/crypto/ocb_openssl.cc b/src/crypto/ocb_openssl.cc
@@ -1,5 +1,5 @@
-#include "config.h"
-#include "ae.h"
+#include "src/include/config.h"
+#include "src/crypto/ae.h"
 
 #include <cstring>
 #include <openssl/crypto.h>

diff --git a/src/crypto/prng.h b/src/crypto/prng.h
@@ -37,7 +37,7 @@
 #include <stdint.h>
 #include <fstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 /* Read random bytes from /dev/urandom.
 

diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
@@ -1,4 +1,4 @@
-AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
+AM_CXXFLAGS = -I$(top_srcdir)/ $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS)
 
 if BUILD_EXAMPLES

diff --git a/src/examples/benchmark.cc b/src/examples/benchmark.cc
@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <errno.h>
 #include <locale.h>
@@ -52,12 +52,12 @@
 #include <util.h>
 #endif
 
-#include "swrite.h"
-#include "completeterminal.h"
-#include "user.h"
-#include "terminaloverlay.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
+#include "src/util/swrite.h"
+#include "src/statesync/completeterminal.h"
+#include "src/statesync/user.h"
+#include "src/frontend/terminaloverlay.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
 
 const int ITERATIONS = 100000;
 

diff --git a/src/examples/decrypt.cc b/src/examples/decrypt.cc
@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 using namespace Crypto;
 

diff --git a/src/examples/encrypt.cc b/src/examples/encrypt.cc
@@ -34,7 +34,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "crypto.h"
+#include "src/crypto/crypto.h"
 
 using namespace Crypto;
 

diff --git a/src/examples/ntester.cc b/src/examples/ntester.cc
@@ -33,12 +33,12 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include "user.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "networktransport-impl.h"
-#include "select.h"
-#include "shared.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/network/networktransport-impl.h"
+#include "src/util/select.h"
+#include "src/util/shared.h"
 
 using namespace Network;
 

diff --git a/src/examples/parse.cc b/src/examples/parse.cc
@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <unistd.h>
 #include <stdio.h>
@@ -53,12 +53,12 @@
 #include <libutil.h>
 #endif
 
-#include "parser.h"
-#include "swrite.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "select.h"
+#include "src/terminal/parser.h"
+#include "src/util/swrite.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
 
 const size_t buf_size = 1024;
 

diff --git a/src/examples/termemu.cc b/src/examples/termemu.cc
@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <unistd.h>
 #include <stdio.h>
@@ -60,13 +60,13 @@
 #include <libutil.h>
 #endif
 
-#include "parser.h"
-#include "completeterminal.h"
-#include "swrite.h"
-#include "fatal_assert.h"
-#include "pty_compat.h"
-#include "locale_utils.h"
-#include "select.h"
+#include "src/terminal/parser.h"
+#include "src/statesync/completeterminal.h"
+#include "src/util/swrite.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/pty_compat.h"
+#include "src/util/locale_utils.h"
+#include "src/util/select.h"
 
 const size_t buf_size = 16384;
 

diff --git a/src/frontend/Makefile.am b/src/frontend/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../statesync -I$(srcdir)/../terminal -I$(srcdir)/../network -I$(srcdir)/../crypto -I../protobufs -I$(srcdir)/../util $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/ $(TINFO_CFLAGS) $(protobuf_CFLAGS) $(CRYPTO_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS) $(PICKY_CXXFLAGS) $(HARDEN_CFLAGS) $(MISC_CXXFLAGS) $(CODE_COVERAGE_CXXFLAGS)
 AM_LDFLAGS  = $(HARDEN_LDFLAGS) $(CODE_COVERAGE_LIBS)
 LDADD = ../crypto/libmoshcrypto.a ../network/libmoshnetwork.a ../statesync/libmoshstatesync.a ../terminal/libmoshterminal.a ../util/libmoshutil.a ../protobufs/libmoshprotos.a -lm $(TINFO_LIBS) $(protobuf_LIBS) $(CRYPTO_LIBS)

diff --git a/src/frontend/mosh-client.cc b/src/frontend/mosh-client.cc
@@ -30,16 +30,16 @@
     also delete it here.
 */
 
-#include "config.h"
-#include "version.h"
+#include "src/include/config.h"
+#include "src/include/version.h"
 
 #include <stdlib.h>
 #include <unistd.h>
 
 #include "stmclient.h"
-#include "crypto.h"
-#include "locale_utils.h"
-#include "fatal_assert.h"
+#include "src/crypto/crypto.h"
+#include "src/util/locale_utils.h"
+#include "src/util/fatal_assert.h"
 
 /* These need to be included last because of conflicting defines. */
 /*

diff --git a/src/frontend/mosh-server.cc b/src/frontend/mosh-server.cc
@@ -30,8 +30,8 @@
     also delete it here.
 */
 
-#include "config.h"
-#include "version.h"
+#include "src/include/config.h"
+#include "src/include/version.h"
 
 #include <err.h>
 #include <errno.h>
@@ -79,21 +79,21 @@
 #include <libutil.h>
 #endif
 
-#include "completeterminal.h"
-#include "swrite.h"
-#include "user.h"
-#include "fatal_assert.h"
-#include "locale_utils.h"
-#include "pty_compat.h"
-#include "select.h"
-#include "timestamp.h"
-#include "fatal_assert.h"
+#include "src/statesync/completeterminal.h"
+#include "src/util/swrite.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/locale_utils.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
+#include "src/util/timestamp.h"
+#include "src/util/fatal_assert.h"
 
 #ifndef _PATH_BSHELL
 #define _PATH_BSHELL "/bin/sh"
 #endif
 
-#include "networktransport-impl.h"
+#include "src/network/networktransport-impl.h"
 
 typedef Network::Transport< Terminal::Complete, Network::UserStream > ServerConnection;
 

diff --git a/src/frontend/stmclient.cc b/src/frontend/stmclient.cc
@@ -30,7 +30,7 @@
     also delete it here.
 */
 
-#include "config.h"
+#include "src/include/config.h"
 
 #include <err.h>
 #include <errno.h>
@@ -52,16 +52,16 @@
 #endif
 
 #include "stmclient.h"
-#include "swrite.h"
-#include "completeterminal.h"
-#include "user.h"
-#include "fatal_assert.h"
-#include "locale_utils.h"
-#include "pty_compat.h"
-#include "select.h"
-#include "timestamp.h"
-
-#include "networktransport-impl.h"
+#include "src/util/swrite.h"
+#include "src/statesync/completeterminal.h"
+#include "src/statesync/user.h"
+#include "src/util/fatal_assert.h"
+#include "src/util/locale_utils.h"
+#include "src/util/pty_compat.h"
+#include "src/util/select.h"
+#include "src/util/timestamp.h"
+
+#include "src/network/networktransport-impl.h"
 
 using std::wstring;
 

diff --git a/src/frontend/stmclient.h b/src/frontend/stmclient.h
@@ -37,11 +37,11 @@
 #include <termios.h>
 #include <string>
 
-#include "completeterminal.h"
-#include "networktransport.h"
-#include "user.h"
-#include "shared.h"
-#include "terminaloverlay.h"
+#include "src/statesync/completeterminal.h"
+#include "src/network/networktransport.h"
+#include "src/statesync/user.h"
+#include "src/util/shared.h"
+#include "src/frontend/terminaloverlay.h"
 
 class STMClient {
 private:

diff --git a/src/frontend/terminaloverlay.cc b/src/frontend/terminaloverlay.cc
@@ -36,7 +36,7 @@
 #include <typeinfo>
 #include <limits.h>
 
-#include "terminaloverlay.h"
+#include "src/frontend/terminaloverlay.h"
 
 using namespace Overlay;
 

diff --git a/src/frontend/terminaloverlay.h b/src/frontend/terminaloverlay.h
@@ -33,10 +33,10 @@
 #ifndef TERMINAL_OVERLAY_HPP
 #define TERMINAL_OVERLAY_HPP
 
-#include "terminalframebuffer.h"
-#include "network.h"
-#include "transportsender.h"
-#include "parser.h"
+#include "src/terminal/terminalframebuffer.h"
+#include "src/network/network.h"
+#include "src/network/transportsender.h"
+#include "src/terminal/parser.h"
 
 #include <vector>
 #include <limits.h>

diff --git a/src/fuzz/Makefile.am b/src/fuzz/Makefile.am
@@ -4,10 +4,10 @@ if ENABLE_FUZZING
   noinst_PROGRAMS = terminal_parser_fuzzer terminal_fuzzer
 endif
 
-terminal_parser_fuzzer_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util
+terminal_parser_fuzzer_CPPFLAGS = -I$(top_srcdir)/
 terminal_parser_fuzzer_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a
 terminal_parser_fuzzer_SOURCES = terminal_parser_fuzzer.cc
 
-terminal_fuzzer_CPPFLAGS = -I$(srcdir)/../terminal -I$(srcdir)/../util -I$(srcdir)/../statesync -I../protobufs
+terminal_fuzzer_CPPFLAGS = -I$(top_srcdir)/
 terminal_fuzzer_LDADD = ../terminal/libmoshterminal.a ../util/libmoshutil.a ../statesync/libmoshstatesync.a ../protobufs/libmoshprotos.a $(TINFO_LIBS) $(protobuf_LIBS)
 terminal_fuzzer_SOURCES = terminal_fuzzer.cc
diff --git a/src/fuzz/terminal_fuzzer.cc b/src/fuzz/terminal_fuzzer.cc
@@ -1,8 +1,8 @@
 #include <cstddef>
 #include <cstdint>
 
-#include "parser.h"
-#include "completeterminal.h"
+#include "src/terminal/parser.h"
+#include "src/statesync/completeterminal.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
   Terminal::Display display(false);