GH-1079: Use full paths starting with zeek/ when including files

src/input/Component.cc

@@ -1,10 +1,10 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Component.h"
-#include "Manager.h"
+#include "zeek/input/Component.h"
+#include "zeek/input/Manager.h"
 
-#include "../Desc.h"
-#include "../util.h"
+#include "zeek/Desc.h"
+#include "zeek/util.h"
 
 namespace zeek::input {
 

src/input/Component.h

@@ -2,9 +2,9 @@
 
 #pragma once
 
-#include "Tag.h"
-#include "plugin/Component.h"
-#include "plugin/TaggedComponent.h"
+#include "zeek/plugin/Component.h"
+#include "zeek/plugin/TaggedComponent.h"
+#include "zeek/input/Tag.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(ReaderFrontend, zeek, input);
 ZEEK_FORWARD_DECLARE_NAMESPACED(ReaderBackend, zeek, input);

src/input/Manager.cc

@@ -1,26 +1,27 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Manager.h"
+#include "zeek/input/Manager.h"
 
 #include <string>
 #include <utility>
 
-#include "ReaderFrontend.h"
-#include "ReaderBackend.h"
-#include "Desc.h"
-#include "module_util.h"
-#include "input.bif.h"
+#include "zeek/input/ReaderFrontend.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/Desc.h"
+#include "zeek/module_util.h"
 
-#include "Expr.h"
-#include "Event.h"
-#include "EventHandler.h"
-#include "NetVar.h"
-#include "RunState.h"
-#include "CompHash.h"
-#include "Func.h"
+#include "zeek/Expr.h"
+#include "zeek/Event.h"
+#include "zeek/EventHandler.h"
+#include "zeek/NetVar.h"
+#include "zeek/RunState.h"
+#include "zeek/CompHash.h"
+#include "zeek/Func.h"
 
-#include "../file_analysis/Manager.h"
-#include "../threading/SerialTypes.h"
+#include "zeek/file_analysis/Manager.h"
+#include "zeek/threading/SerialTypes.h"
+
+#include "input/input.bif.h"
 
 using namespace std;
 using zeek::threading::Value;

src/input/Manager.h

@@ -6,11 +6,11 @@
 
 #include <map>
 
-#include "Component.h"
-#include "EventHandler.h"
-#include "plugin/ComponentManager.h"
-#include "threading/SerialTypes.h"
-#include "Tag.h"
+#include "zeek/input/Component.h"
+#include "zeek/EventHandler.h"
+#include "zeek/plugin/ComponentManager.h"
+#include "zeek/threading/SerialTypes.h"
+#include "zeek/input/Tag.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(RecordVal, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(ReaderFrontend, zeek, input);

src/input/ReaderBackend.cc

@@ -1,8 +1,8 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "ReaderBackend.h"
-#include "ReaderFrontend.h"
-#include "Manager.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/input/ReaderFrontend.h"
+#include "zeek/input/Manager.h"
 
 using zeek::threading::Value;
 using zeek::threading::Field;

src/input/ReaderBackend.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
-#include "ZeekString.h"
+#include "zeek/ZeekString.h"
 
-#include "threading/SerialTypes.h"
-#include "threading/MsgThread.h"
+#include "zeek/threading/SerialTypes.h"
+#include "zeek/threading/MsgThread.h"
 
-#include "Component.h"
+#include "zeek/input/Component.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(ReaderFrontend, zeek::input);
 

src/input/ReaderFrontend.cc

@@ -1,8 +1,9 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Manager.h"
-#include "ReaderFrontend.h"
-#include "ReaderBackend.h"
+#include "zeek/input/ReaderFrontend.h"
+
+#include "zeek/input/Manager.h"
+#include "zeek/input/ReaderBackend.h"
 
 namespace zeek::input {
 

src/input/ReaderFrontend.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "ReaderBackend.h"
-#include "threading/SerialTypes.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/threading/SerialTypes.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
 ZEEK_FORWARD_DECLARE_NAMESPACED(Manager, zeek, input);

src/input/Tag.cc

@@ -1,7 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include "Tag.h"
-#include "Manager.h"
+#include "zeek/input/Tag.h"
+#include "zeek/input/Manager.h"
 
 namespace zeek::input {
 

src/input/Tag.h

@@ -3,7 +3,7 @@
 #pragma once
 
 #include "zeek-config.h"
-#include "../Tag.h"
+#include "zeek/Tag.h"
 
 ZEEK_FORWARD_DECLARE_NAMESPACED(EnumVal, zeek);
 

src/input/input.bif

@@ -3,7 +3,7 @@
 module Input;
 
 %%{
-#include "input/Manager.h"
+#include "zeek/input/Manager.h"
 %%}
 
 enum Event %{

src/input/readers/ascii/Ascii.cc

@@ -1,17 +1,17 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <sstream>
+#include "zeek/input/readers/ascii/Ascii.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
+#include <sstream>
+
+#include "zeek/threading/SerialTypes.h"
 
-#include "Ascii.h"
 #include "ascii.bif.h"
 
-#include "threading/SerialTypes.h"
-
 using namespace std;
 using zeek::threading::Value;
 using zeek::threading::Field;

src/input/readers/ascii/Ascii.h

@@ -2,14 +2,14 @@
 
 #pragma once
 
+#include <sys/types.h>
 #include <iostream>
 #include <vector>
 #include <fstream>
 #include <memory>
-#include <sys/types.h>
 
-#include "input/ReaderBackend.h"
-#include "threading/formatters/Ascii.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
 
 namespace zeek::input::reader::detail {
 

src/input/readers/ascii/Plugin.cc

@@ -1,8 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "plugin/Plugin.h"
-
-#include "Ascii.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/ascii/Ascii.h"
 
 namespace zeek::plugin::detail::Zeek_AsciiReader {
 

src/input/readers/benchmark/Benchmark.cc

@@ -1,15 +1,16 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/input/readers/benchmark/Benchmark.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 
-#include "Benchmark.h"
-#include "benchmark.bif.h"
+#include "zeek/threading/SerialTypes.h"
+#include "zeek/threading/Manager.h"
 
-#include "threading/SerialTypes.h"
-#include "threading/Manager.h"
+#include "benchmark.bif.h"
 
 using threading::Value;
 using threading::Field;

src/input/readers/benchmark/Benchmark.h

@@ -2,8 +2,8 @@
 
 #pragma once
 
-#include "input/ReaderBackend.h"
-#include "threading/formatters/Ascii.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
 
 namespace zeek::input::reader::detail {
 

src/input/readers/benchmark/Plugin.cc

@@ -1,8 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "plugin/Plugin.h"
-
-#include "Benchmark.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/benchmark/Benchmark.h"
 
 namespace zeek::plugin::detail::Zeek_BenchmarkReader {
 

src/input/readers/binary/Binary.cc

@@ -1,11 +1,12 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/input/readers/binary/Binary.h"
+
 #include <sys/stat.h>
 
-#include "Binary.h"
-#include "binary.bif.h"
+#include "zeek/threading/SerialTypes.h"
 
-#include "threading/SerialTypes.h"
+#include "input/readers/binary/binary.bif.h"
 
 using namespace std;
 using zeek::threading::Value;

src/input/readers/binary/Binary.h

@@ -5,7 +5,7 @@
 #include <fstream>
 #include <sys/types.h>
 
-#include "input/ReaderBackend.h"
+#include "zeek/input/ReaderBackend.h"
 
 namespace zeek::input::reader::detail {
 

src/input/readers/binary/Plugin.cc

@@ -1,8 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "plugin/Plugin.h"
-
-#include "Binary.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/binary/Binary.h"
 
 namespace zeek::plugin::detail::Zeek_BinaryReader {
 

src/input/readers/config/Config.cc

@@ -1,20 +1,20 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
-#include <sstream>
-#include <unordered_set>
+#include "zeek/input/readers/config/Config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
 #include <regex.h>
+#include <sstream>
+#include <unordered_set>
+
+#include "zeek/input/Manager.h"
+#include "zeek/threading/SerialTypes.h"
 
-#include "Config.h"
 #include "config.bif.h"
 
-#include "input/Manager.h"
-#include "threading/SerialTypes.h"
-
 using zeek::threading::Value;
 using zeek::threading::Field;
 

src/input/readers/config/Config.h

@@ -2,15 +2,15 @@
 
 #pragma once
 
+#include <sys/types.h>
 #include <iostream>
 #include <vector>
 #include <fstream>
 #include <memory>
 #include <unordered_map>
-#include <sys/types.h>
 
-#include "input/ReaderBackend.h"
-#include "threading/formatters/Ascii.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
 
 namespace zeek::input::reader::detail {
 

src/input/readers/config/Plugin.cc

@@ -1,8 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "plugin/Plugin.h"
-
-#include "Config.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/config/Config.h"
 
 namespace zeek::plugin::detail::Zeek_ConfigReader {
 

src/input/readers/raw/Plugin.cc

@@ -1,6 +1,6 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "Plugin.h"
+#include "zeek/input/readers/raw/Plugin.h"
 
 namespace zeek::plugin::detail::Zeek_RawReader {
 

src/input/readers/raw/Plugin.h

@@ -4,9 +4,8 @@
 
 #include <mutex>
 
-#include "plugin/Plugin.h"
-
-#include "Raw.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/raw/Raw.h"
 
 namespace zeek::plugin::detail::Zeek_RawReader {
 

src/input/readers/raw/Raw.cc

@@ -1,5 +1,7 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
+#include "zeek/input/readers/raw/Raw.h"
+
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -10,14 +12,13 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include "Raw.h"
-#include "Plugin.h"
-#include "raw.bif.h"
+#include "zeek/input/readers/raw/Plugin.h"
+#include "zeek/threading/SerialTypes.h"
 
-#include "threading/SerialTypes.h"
+#include "input/readers/raw/raw.bif.h"
 
 extern "C" {
-#include "setsignal.h"
+#include "zeek/setsignal.h"
 }
 
 using zeek::threading::Value;

src/input/readers/raw/Raw.h

@@ -2,12 +2,12 @@
 
 #pragma once
 
+#include <sys/types.h>
 #include <vector>
 #include <memory>
 #include <mutex>
-#include <sys/types.h>
 
-#include "input/ReaderBackend.h"
+#include "zeek/input/ReaderBackend.h"
 
 namespace zeek::input::reader::detail {
 

src/input/readers/sqlite/Plugin.cc

@@ -1,8 +1,7 @@
 // See the file  in the main distribution directory for copyright.
 
-#include "plugin/Plugin.h"
-
-#include "SQLite.h"
+#include "zeek/plugin/Plugin.h"
+#include "zeek/input/readers/sqlite/SQLite.h"
 
 namespace zeek::plugin::detail::Zeek_SQLiteReader {
 

src/input/readers/sqlite/SQLite.cc

@@ -1,20 +1,20 @@
 // See the file "COPYING" in the main distribution directory for copyright.
 
 #include "zeek-config.h"
+#include "zeek/input/readers/sqlite/SQLite.h"
 
-#include <fstream>
-#include <sstream>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <fstream>
+#include <sstream>
 
-#include "SQLite.h"
-#include "sqlite.bif.h"
+#include "zeek/threading/SerialTypes.h"
+
+#include "input/readers/sqlite/sqlite.bif.h"
 #include "logging/writers/sqlite/sqlite.bif.h"
 #include "logging/writers/ascii/ascii.bif.h"
 
-#include "threading/SerialTypes.h"
-
 using zeek::threading::Value;
 using zeek::threading::Field;
 

src/input/readers/sqlite/SQLite.h

@@ -6,10 +6,10 @@
 
 #include <iostream>
 #include <vector>
+#include "zeek/3rdparty/sqlite3.h"
 
-#include "input/ReaderBackend.h"
-#include "threading/formatters/Ascii.h"
-#include "3rdparty/sqlite3.h"
+#include "zeek/input/ReaderBackend.h"
+#include "zeek/threading/formatters/Ascii.h"
 
 namespace zeek::input::reader::detail {