WIP

CERT-Polska · Apr 10, 2020 · 41ab2ad · 41ab2ad
1 parent a966aeb
commit 41ab2ad
Show file tree

Hide file tree

Showing 216 changed files with 189 additions and 98 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,70 +1,34 @@
 cmake_minimum_required(VERSION 3.5)
-project(ursadb VERSION 1.3.0)
+project(ursadb VERSION 1.3.0
+               LANGUAGES CXX)
+
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+include(ClangFormat)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_FLAGS "-Wall")
-
-message("Looking for clang-format")
-find_program(CLANG_FORMAT_EXEC clang-format)
-if(NOT EXISTS ${CLANG_FORMAT_EXEC})
-    message(WARNING "clang-format not found! Target 'format' won't be available")
-else()
-    file(GLOB FORMAT_SOURCES *.cpp *.h)
-    add_custom_target(format
-      COMMAND
-       ${CLANG_FORMAT_EXEC}
-       -style=file
-       -i
-       ${FORMAT_SOURCES}
-      WORKING_DIRECTORY
-       ${CMAKE_SOURCE_DIR}
-      COMMENT
-      "Formatting..."
-    )
-endif()
-
-configure_file(Version.h.in Version.h)
 
-add_library(
-    ursa
-    STATIC
-    Utils.cpp
-    OnDiskDataset.cpp
-    OnDiskIterator.cpp
-    DatasetBuilder.cpp
-    Database.cpp
-    Trim.cpp
-    OnDiskIndex.cpp
-    FlatIndexBuilder.cpp
-    BitmapIndexBuilder.cpp
-    MemMap.cpp
-    Query.cpp
-    QueryParser.cpp
-    ExclusiveFile.cpp
-    DatabaseSnapshot.cpp
-    Task.cpp
-    Indexer.cpp
-    DatabaseHandle.cpp
-    ZHelpers.cpp
-    Responses.cpp
-    RawFile.cpp
-    OnDiskFileIndex.cpp
-)
-target_include_directories(ursa PRIVATE ${PROJECT_BINARY_DIR})
-target_link_libraries(ursa -lstdc++fs -lzmq -pthread)
+add_subdirectory(libursa)
 
-add_executable(ursadb Daemon.cpp NetworkService.cpp)
+add_executable(ursadb src/Daemon.cpp
+                      src/Daemon.h
+                      src/NetworkService.cpp
+                      src/NetworkService.h)
+target_include_directories(ursadb PUBLIC ${CMAKE_SOURCE_DIR})
 target_link_libraries(ursadb ursa)
 
-add_executable(ursadb_new NewDatabase.cpp)
+add_executable(ursadb_new src/NewDatabase.cpp)
+target_include_directories(ursadb_new PUBLIC ${CMAKE_SOURCE_DIR})
 target_link_libraries(ursadb_new ursa)
 
-add_executable(ursadb_trim Trim.cpp)
+add_executable(ursadb_trim src/Trim.cpp)
+target_include_directories(ursadb_trim PUBLIC ${CMAKE_SOURCE_DIR})
 target_link_libraries(ursadb_trim ursa)
 
-add_executable(ursadb_test Tests.cpp)
+add_executable(ursadb_test src/Tests.cpp)
+target_include_directories(ursadb_test PUBLIC ${CMAKE_SOURCE_DIR})
 target_link_libraries(ursadb_test ursa)
 
-add_executable(ursadb_bench Benchmark.cpp)
-target_link_libraries(ursadb_bench ursa)
+add_executable(ursadb_bench src/Benchmark.cpp)
+target_include_directories(ursadb_bench PUBLIC ${CMAKE_SOURCE_DIR})
+target_link_libraries(ursadb_bench ursa)
diff --git a/cmake/ClangFormat.cmake b/cmake/ClangFormat.cmake
@@ -0,0 +1,48 @@
+# Copyright Tomas Zeman 2019.
+# Distributed under the Boost Software License, Version 1.0.
+# (See accompanying file LICENSE_1_0.txt or copy at
+# http://www.boost.org/LICENSE_1_0.txt)
+
+function(clangformat_setup)
+  if(NOT CLANGFORMAT_EXECUTABLE)
+    set(CLANGFORMAT_EXECUTABLE clang-format)
+  endif()
+
+  if(NOT EXISTS ${CLANGFORMAT_EXECUTABLE})
+    find_program(clangformat_executable_tmp ${CLANGFORMAT_EXECUTABLE})
+    if(clangformat_executable_tmp)
+      set(CLANGFORMAT_EXECUTABLE ${clangformat_executable_tmp})
+      unset(clangformat_executable_tmp)
+    else()
+      message(FATAL_ERROR "ClangFormat: ${CLANGFORMAT_EXECUTABLE} not found! Aborting")
+    endif()
+  endif()
+
+  foreach(clangformat_source ${ARGV})
+    get_filename_component(clangformat_source ${clangformat_source} ABSOLUTE)
+    list(APPEND clangformat_sources ${clangformat_source})
+  endforeach()
+
+  add_custom_target(${PROJECT_NAME}_clangformat
+    COMMAND
+      ${CLANGFORMAT_EXECUTABLE}
+      -style=file
+      -i
+      ${clangformat_sources}
+    WORKING_DIRECTORY
+      ${CMAKE_SOURCE_DIR}
+    COMMENT
+      "Formating with ${CLANGFORMAT_EXECUTABLE} ..."
+  )
+
+  if(TARGET clangformat)
+    add_dependencies(clangformat ${PROJECT_NAME}_clangformat)
+  else()
+    add_custom_target(clangformat DEPENDS ${PROJECT_NAME}_clangformat)
+  endif()
+endfunction()
+
+function(target_clangformat_setup target)
+  get_target_property(target_sources ${target} SOURCES)
+  clangformat_setup(${target_sources})
+endfunction()
diff --git a/BitmapIndexBuilder.cpp → libursa/BitmapIndexBuilder.cpp b/BitmapIndexBuilder.cpp → libursa/BitmapIndexBuilder.cpp
diff --git a/BitmapIndexBuilder.h → libursa/BitmapIndexBuilder.h b/BitmapIndexBuilder.h → libursa/BitmapIndexBuilder.h
diff --git a/libursa/CMakeLists.txt b/libursa/CMakeLists.txt
@@ -0,0 +1,57 @@
+add_library(
+    ursa
+    STATIC
+    BitmapIndexBuilder.cpp 
+    Database.h
+    DatasetBuilder.h
+    IndexBuilder.h
+    OnDiskDataset.cpp
+    OnDiskIterator.cpp
+    RawFile.cpp
+    Task.h
+    BitmapIndexBuilder.h
+    DatabaseHandle.cpp
+    ExclusiveFile.cpp
+    Indexer.cpp
+    OnDiskDataset.h
+    OnDiskIterator.h
+    RawFile.h
+    Utils.cpp
+    DatabaseHandle.h
+    ExclusiveFile.h
+    Indexer.h
+    OnDiskFileIndex.cpp
+    Query.cpp
+    Responses.cpp
+    Utils.h
+    Command.h
+    DatabaseSnapshot.cpp
+    Json.h
+    OnDiskFileIndex.h
+    Query.h
+    Responses.h
+    Version.h.in
+    Core.h
+    DatabaseSnapshot.h
+    FlatIndexBuilder.cpp
+    MemMap.cpp
+    OnDiskIndex.cpp
+    QueryParser.cpp
+    ResultWriter.h
+    ZHelpers.cpp
+    Database.cpp
+    DatasetBuilder.cpp
+    FlatIndexBuilder.h
+    MemMap.h
+    OnDiskIndex.h
+    QueryParser.h
+    Task.cpp
+    ZHelpers.h
+)
+configure_file(Version.h.in
+               ${PROJECT_BINARY_DIR}/generated/Version.h)
+
+target_include_directories(ursa PRIVATE .
+                                PRIVATE ${PROJECT_BINARY_DIR}/generated)
+target_link_libraries(ursa -lstdc++fs -lzmq -pthread)
+target_clangformat_setup(ursa)
diff --git a/Command.h → libursa/Command.h b/Command.h → libursa/Command.h
diff --git a/Core.h → libursa/Core.h b/Core.h → libursa/Core.h
diff --git a/Database.cpp → libursa/Database.cpp b/Database.cpp → libursa/Database.cpp
diff --git a/Database.h → libursa/Database.h b/Database.h → libursa/Database.h
diff --git a/DatabaseHandle.cpp → libursa/DatabaseHandle.cpp b/DatabaseHandle.cpp → libursa/DatabaseHandle.cpp
diff --git a/DatabaseHandle.h → libursa/DatabaseHandle.h b/DatabaseHandle.h → libursa/DatabaseHandle.h
diff --git a/DatabaseSnapshot.cpp → libursa/DatabaseSnapshot.cpp b/DatabaseSnapshot.cpp → libursa/DatabaseSnapshot.cpp
diff --git a/DatabaseSnapshot.h → libursa/DatabaseSnapshot.h b/DatabaseSnapshot.h → libursa/DatabaseSnapshot.h
diff --git a/DatasetBuilder.cpp → libursa/DatasetBuilder.cpp b/DatasetBuilder.cpp → libursa/DatasetBuilder.cpp
diff --git a/DatasetBuilder.h → libursa/DatasetBuilder.h b/DatasetBuilder.h → libursa/DatasetBuilder.h
diff --git a/ExclusiveFile.cpp → libursa/ExclusiveFile.cpp b/ExclusiveFile.cpp → libursa/ExclusiveFile.cpp
diff --git a/ExclusiveFile.h → libursa/ExclusiveFile.h b/ExclusiveFile.h → libursa/ExclusiveFile.h
diff --git a/FlatIndexBuilder.cpp → libursa/FlatIndexBuilder.cpp b/FlatIndexBuilder.cpp → libursa/FlatIndexBuilder.cpp
diff --git a/FlatIndexBuilder.h → libursa/FlatIndexBuilder.h b/FlatIndexBuilder.h → libursa/FlatIndexBuilder.h
diff --git a/IndexBuilder.h → libursa/IndexBuilder.h b/IndexBuilder.h → libursa/IndexBuilder.h
diff --git a/Indexer.cpp → libursa/Indexer.cpp b/Indexer.cpp → libursa/Indexer.cpp
diff --git a/Indexer.h → libursa/Indexer.h b/Indexer.h → libursa/Indexer.h
diff --git a/Json.h → libursa/Json.h b/Json.h → libursa/Json.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#include "lib/Json.h"
+#include "extern/json/Json.h"
 
 using json = nlohmann::json;
diff --git a/MemMap.cpp → libursa/MemMap.cpp b/MemMap.cpp → libursa/MemMap.cpp
diff --git a/MemMap.h → libursa/MemMap.h b/MemMap.h → libursa/MemMap.h
diff --git a/OnDiskDataset.cpp → libursa/OnDiskDataset.cpp b/OnDiskDataset.cpp → libursa/OnDiskDataset.cpp
diff --git a/OnDiskDataset.h → libursa/OnDiskDataset.h b/OnDiskDataset.h → libursa/OnDiskDataset.h
diff --git a/OnDiskFileIndex.cpp → libursa/OnDiskFileIndex.cpp b/OnDiskFileIndex.cpp → libursa/OnDiskFileIndex.cpp
diff --git a/OnDiskFileIndex.h → libursa/OnDiskFileIndex.h b/OnDiskFileIndex.h → libursa/OnDiskFileIndex.h
diff --git a/OnDiskIndex.cpp → libursa/OnDiskIndex.cpp b/OnDiskIndex.cpp → libursa/OnDiskIndex.cpp
diff --git a/OnDiskIndex.h → libursa/OnDiskIndex.h b/OnDiskIndex.h → libursa/OnDiskIndex.h
diff --git a/OnDiskIterator.cpp → libursa/OnDiskIterator.cpp b/OnDiskIterator.cpp → libursa/OnDiskIterator.cpp
diff --git a/OnDiskIterator.h → libursa/OnDiskIterator.h b/OnDiskIterator.h → libursa/OnDiskIterator.h
diff --git a/Query.cpp → libursa/Query.cpp b/Query.cpp → libursa/Query.cpp
diff --git a/Query.h → libursa/Query.h b/Query.h → libursa/Query.h
diff --git a/QueryParser.cpp → libursa/QueryParser.cpp b/QueryParser.cpp → libursa/QueryParser.cpp
@@ -11,10 +11,10 @@
 #include "Command.h"
 #include "Core.h"
 #include "Query.h"
-#include "lib/pegtl.hpp"
-#include "lib/pegtl/contrib/abnf.hpp"
-#include "lib/pegtl/contrib/parse_tree.hpp"
-#include "lib/pegtl/contrib/unescape.hpp"
+#include "extern/pegtl/pegtl.hpp"
+#include "extern/pegtl/pegtl/contrib/abnf.hpp"
+#include "extern/pegtl/pegtl/contrib/parse_tree.hpp"
+#include "extern/pegtl/pegtl/contrib/unescape.hpp"
 
 using namespace tao::TAO_PEGTL_NAMESPACE;  // NOLINT
 

diff --git a/QueryParser.h → libursa/QueryParser.h b/QueryParser.h → libursa/QueryParser.h
diff --git a/RawFile.cpp → libursa/RawFile.cpp b/RawFile.cpp → libursa/RawFile.cpp
diff --git a/RawFile.h → libursa/RawFile.h b/RawFile.h → libursa/RawFile.h
diff --git a/Responses.cpp → libursa/Responses.cpp b/Responses.cpp → libursa/Responses.cpp
diff --git a/Responses.h → libursa/Responses.h b/Responses.h → libursa/Responses.h
diff --git a/ResultWriter.h → libursa/ResultWriter.h b/ResultWriter.h → libursa/ResultWriter.h
diff --git a/Task.cpp → libursa/Task.cpp b/Task.cpp → libursa/Task.cpp
diff --git a/Task.h → libursa/Task.h b/Task.h → libursa/Task.h
diff --git a/Utils.cpp → libursa/Utils.cpp b/Utils.cpp → libursa/Utils.cpp
diff --git a/Utils.h → libursa/Utils.h b/Utils.h → libursa/Utils.h
diff --git a/Version.h.in → libursa/Version.h.in b/Version.h.in → libursa/Version.h.in
diff --git a/ZHelpers.cpp → libursa/ZHelpers.cpp b/ZHelpers.cpp → libursa/ZHelpers.cpp
diff --git a/ZHelpers.h → libursa/ZHelpers.h b/ZHelpers.h → libursa/ZHelpers.h
diff --git a/lib/Json.h → libursa/extern/json/Json.h b/lib/Json.h → libursa/extern/json/Json.h
diff --git a/lib/pegtl.hpp → libursa/extern/pegtl/pegtl.hpp b/lib/pegtl.hpp → libursa/extern/pegtl/pegtl.hpp
diff --git a/lib/pegtl/analysis/analyze_cycles.hpp → ...n/pegtl/pegtl/analysis/analyze_cycles.hpp b/lib/pegtl/analysis/analyze_cycles.hpp → ...n/pegtl/pegtl/analysis/analyze_cycles.hpp
diff --git a/lib/pegtl/analysis/counted.hpp → ...a/extern/pegtl/pegtl/analysis/counted.hpp b/lib/pegtl/analysis/counted.hpp → ...a/extern/pegtl/pegtl/analysis/counted.hpp
diff --git a/lib/pegtl/analysis/generic.hpp → ...a/extern/pegtl/pegtl/analysis/generic.hpp b/lib/pegtl/analysis/generic.hpp → ...a/extern/pegtl/pegtl/analysis/generic.hpp
diff --git a/lib/pegtl/analysis/grammar_info.hpp → ...ern/pegtl/pegtl/analysis/grammar_info.hpp b/lib/pegtl/analysis/grammar_info.hpp → ...ern/pegtl/pegtl/analysis/grammar_info.hpp
diff --git a/lib/pegtl/analysis/insert_guard.hpp → ...ern/pegtl/pegtl/analysis/insert_guard.hpp b/lib/pegtl/analysis/insert_guard.hpp → ...ern/pegtl/pegtl/analysis/insert_guard.hpp
diff --git a/lib/pegtl/analysis/insert_rules.hpp → ...ern/pegtl/pegtl/analysis/insert_rules.hpp b/lib/pegtl/analysis/insert_rules.hpp → ...ern/pegtl/pegtl/analysis/insert_rules.hpp
diff --git a/lib/pegtl/analysis/rule_info.hpp → ...extern/pegtl/pegtl/analysis/rule_info.hpp b/lib/pegtl/analysis/rule_info.hpp → ...extern/pegtl/pegtl/analysis/rule_info.hpp
diff --git a/lib/pegtl/analysis/rule_type.hpp → ...extern/pegtl/pegtl/analysis/rule_type.hpp b/lib/pegtl/analysis/rule_type.hpp → ...extern/pegtl/pegtl/analysis/rule_type.hpp
diff --git a/lib/pegtl/analyze.hpp → libursa/extern/pegtl/pegtl/analyze.hpp b/lib/pegtl/analyze.hpp → libursa/extern/pegtl/pegtl/analyze.hpp
diff --git a/lib/pegtl/apply_mode.hpp → libursa/extern/pegtl/pegtl/apply_mode.hpp b/lib/pegtl/apply_mode.hpp → libursa/extern/pegtl/pegtl/apply_mode.hpp
diff --git a/lib/pegtl/argv_input.hpp → libursa/extern/pegtl/pegtl/argv_input.hpp b/lib/pegtl/argv_input.hpp → libursa/extern/pegtl/pegtl/argv_input.hpp
diff --git a/lib/pegtl/ascii.hpp → libursa/extern/pegtl/pegtl/ascii.hpp b/lib/pegtl/ascii.hpp → libursa/extern/pegtl/pegtl/ascii.hpp
diff --git a/lib/pegtl/buffer_input.hpp → libursa/extern/pegtl/pegtl/buffer_input.hpp b/lib/pegtl/buffer_input.hpp → libursa/extern/pegtl/pegtl/buffer_input.hpp
diff --git a/lib/pegtl/config.hpp → libursa/extern/pegtl/pegtl/config.hpp b/lib/pegtl/config.hpp → libursa/extern/pegtl/pegtl/config.hpp
diff --git a/lib/pegtl/contrib/abnf.hpp → libursa/extern/pegtl/pegtl/contrib/abnf.hpp b/lib/pegtl/contrib/abnf.hpp → libursa/extern/pegtl/pegtl/contrib/abnf.hpp
diff --git a/lib/pegtl/contrib/alphabet.hpp → ...a/extern/pegtl/pegtl/contrib/alphabet.hpp b/lib/pegtl/contrib/alphabet.hpp → ...a/extern/pegtl/pegtl/contrib/alphabet.hpp
diff --git a/lib/pegtl/contrib/changes.hpp → ...sa/extern/pegtl/pegtl/contrib/changes.hpp b/lib/pegtl/contrib/changes.hpp → ...sa/extern/pegtl/pegtl/contrib/changes.hpp
diff --git a/lib/pegtl/contrib/counter.hpp → ...sa/extern/pegtl/pegtl/contrib/counter.hpp b/lib/pegtl/contrib/counter.hpp → ...sa/extern/pegtl/pegtl/contrib/counter.hpp
diff --git a/lib/pegtl/contrib/http.hpp → libursa/extern/pegtl/pegtl/contrib/http.hpp b/lib/pegtl/contrib/http.hpp → libursa/extern/pegtl/pegtl/contrib/http.hpp
diff --git a/lib/pegtl/contrib/icu/internal.hpp → ...tern/pegtl/pegtl/contrib/icu/internal.hpp b/lib/pegtl/contrib/icu/internal.hpp → ...tern/pegtl/pegtl/contrib/icu/internal.hpp
diff --git a/lib/pegtl/contrib/icu/utf16.hpp → .../extern/pegtl/pegtl/contrib/icu/utf16.hpp b/lib/pegtl/contrib/icu/utf16.hpp → .../extern/pegtl/pegtl/contrib/icu/utf16.hpp
diff --git a/lib/pegtl/contrib/icu/utf32.hpp → .../extern/pegtl/pegtl/contrib/icu/utf32.hpp b/lib/pegtl/contrib/icu/utf32.hpp → .../extern/pegtl/pegtl/contrib/icu/utf32.hpp
diff --git a/lib/pegtl/contrib/icu/utf8.hpp → ...a/extern/pegtl/pegtl/contrib/icu/utf8.hpp b/lib/pegtl/contrib/icu/utf8.hpp → ...a/extern/pegtl/pegtl/contrib/icu/utf8.hpp
diff --git a/lib/pegtl/contrib/integer.hpp → ...sa/extern/pegtl/pegtl/contrib/integer.hpp b/lib/pegtl/contrib/integer.hpp → ...sa/extern/pegtl/pegtl/contrib/integer.hpp
diff --git a/lib/pegtl/contrib/json.hpp → libursa/extern/pegtl/pegtl/contrib/json.hpp b/lib/pegtl/contrib/json.hpp → libursa/extern/pegtl/pegtl/contrib/json.hpp
diff --git a/lib/pegtl/contrib/parse_tree.hpp → ...extern/pegtl/pegtl/contrib/parse_tree.hpp b/lib/pegtl/contrib/parse_tree.hpp → ...extern/pegtl/pegtl/contrib/parse_tree.hpp
diff --git a/lib/pegtl/contrib/raw_string.hpp → ...extern/pegtl/pegtl/contrib/raw_string.hpp b/lib/pegtl/contrib/raw_string.hpp → ...extern/pegtl/pegtl/contrib/raw_string.hpp
diff --git a/lib/pegtl/contrib/rep_one_min_max.hpp → ...n/pegtl/pegtl/contrib/rep_one_min_max.hpp b/lib/pegtl/contrib/rep_one_min_max.hpp → ...n/pegtl/pegtl/contrib/rep_one_min_max.hpp
diff --git a/lib/pegtl/contrib/to_string.hpp → .../extern/pegtl/pegtl/contrib/to_string.hpp b/lib/pegtl/contrib/to_string.hpp → .../extern/pegtl/pegtl/contrib/to_string.hpp
diff --git a/lib/pegtl/contrib/tracer.hpp → ...rsa/extern/pegtl/pegtl/contrib/tracer.hpp b/lib/pegtl/contrib/tracer.hpp → ...rsa/extern/pegtl/pegtl/contrib/tracer.hpp
diff --git a/lib/pegtl/contrib/unescape.hpp → ...a/extern/pegtl/pegtl/contrib/unescape.hpp b/lib/pegtl/contrib/unescape.hpp → ...a/extern/pegtl/pegtl/contrib/unescape.hpp
diff --git a/lib/pegtl/contrib/uri.hpp → libursa/extern/pegtl/pegtl/contrib/uri.hpp b/lib/pegtl/contrib/uri.hpp → libursa/extern/pegtl/pegtl/contrib/uri.hpp
diff --git a/lib/pegtl/cstream_input.hpp → libursa/extern/pegtl/pegtl/cstream_input.hpp b/lib/pegtl/cstream_input.hpp → libursa/extern/pegtl/pegtl/cstream_input.hpp
diff --git a/lib/pegtl/eol.hpp → libursa/extern/pegtl/pegtl/eol.hpp b/lib/pegtl/eol.hpp → libursa/extern/pegtl/pegtl/eol.hpp
diff --git a/lib/pegtl/eol_pair.hpp → libursa/extern/pegtl/pegtl/eol_pair.hpp b/lib/pegtl/eol_pair.hpp → libursa/extern/pegtl/pegtl/eol_pair.hpp
diff --git a/lib/pegtl/file_input.hpp → libursa/extern/pegtl/pegtl/file_input.hpp b/lib/pegtl/file_input.hpp → libursa/extern/pegtl/pegtl/file_input.hpp
diff --git a/lib/pegtl/input_error.hpp → libursa/extern/pegtl/pegtl/input_error.hpp b/lib/pegtl/input_error.hpp → libursa/extern/pegtl/pegtl/input_error.hpp
diff --git a/lib/pegtl/internal/action.hpp → ...sa/extern/pegtl/pegtl/internal/action.hpp b/lib/pegtl/internal/action.hpp → ...sa/extern/pegtl/pegtl/internal/action.hpp
diff --git a/lib/pegtl/internal/action_input.hpp → ...ern/pegtl/pegtl/internal/action_input.hpp b/lib/pegtl/internal/action_input.hpp → ...ern/pegtl/pegtl/internal/action_input.hpp
diff --git a/lib/pegtl/internal/alnum.hpp → ...rsa/extern/pegtl/pegtl/internal/alnum.hpp b/lib/pegtl/internal/alnum.hpp → ...rsa/extern/pegtl/pegtl/internal/alnum.hpp
diff --git a/lib/pegtl/internal/alpha.hpp → ...rsa/extern/pegtl/pegtl/internal/alpha.hpp b/lib/pegtl/internal/alpha.hpp → ...rsa/extern/pegtl/pegtl/internal/alpha.hpp
diff --git a/lib/pegtl/internal/any.hpp → libursa/extern/pegtl/pegtl/internal/any.hpp b/lib/pegtl/internal/any.hpp → libursa/extern/pegtl/pegtl/internal/any.hpp
diff --git a/lib/pegtl/internal/apply.hpp → ...rsa/extern/pegtl/pegtl/internal/apply.hpp b/lib/pegtl/internal/apply.hpp → ...rsa/extern/pegtl/pegtl/internal/apply.hpp
diff --git a/lib/pegtl/internal/apply0.hpp → ...sa/extern/pegtl/pegtl/internal/apply0.hpp b/lib/pegtl/internal/apply0.hpp → ...sa/extern/pegtl/pegtl/internal/apply0.hpp
diff --git a/lib/pegtl/internal/apply0_single.hpp → ...rn/pegtl/pegtl/internal/apply0_single.hpp b/lib/pegtl/internal/apply0_single.hpp → ...rn/pegtl/pegtl/internal/apply0_single.hpp
diff --git a/lib/pegtl/internal/apply_single.hpp → ...ern/pegtl/pegtl/internal/apply_single.hpp b/lib/pegtl/internal/apply_single.hpp → ...ern/pegtl/pegtl/internal/apply_single.hpp
diff --git a/lib/pegtl/internal/at.hpp → libursa/extern/pegtl/pegtl/internal/at.hpp b/lib/pegtl/internal/at.hpp → libursa/extern/pegtl/pegtl/internal/at.hpp
diff --git a/lib/pegtl/internal/bof.hpp → libursa/extern/pegtl/pegtl/internal/bof.hpp b/lib/pegtl/internal/bof.hpp → libursa/extern/pegtl/pegtl/internal/bof.hpp
diff --git a/lib/pegtl/internal/bol.hpp → libursa/extern/pegtl/pegtl/internal/bol.hpp b/lib/pegtl/internal/bol.hpp → libursa/extern/pegtl/pegtl/internal/bol.hpp
diff --git a/lib/pegtl/internal/bump_help.hpp → ...extern/pegtl/pegtl/internal/bump_help.hpp b/lib/pegtl/internal/bump_help.hpp → ...extern/pegtl/pegtl/internal/bump_help.hpp
diff --git a/lib/pegtl/internal/bump_impl.hpp → ...extern/pegtl/pegtl/internal/bump_impl.hpp b/lib/pegtl/internal/bump_impl.hpp → ...extern/pegtl/pegtl/internal/bump_impl.hpp
diff --git a/lib/pegtl/internal/bytes.hpp → ...rsa/extern/pegtl/pegtl/internal/bytes.hpp b/lib/pegtl/internal/bytes.hpp → ...rsa/extern/pegtl/pegtl/internal/bytes.hpp
diff --git a/lib/pegtl/internal/control.hpp → ...a/extern/pegtl/pegtl/internal/control.hpp b/lib/pegtl/internal/control.hpp → ...a/extern/pegtl/pegtl/internal/control.hpp
diff --git a/lib/pegtl/internal/cr_crlf_eol.hpp → ...tern/pegtl/pegtl/internal/cr_crlf_eol.hpp b/lib/pegtl/internal/cr_crlf_eol.hpp → ...tern/pegtl/pegtl/internal/cr_crlf_eol.hpp
diff --git a/lib/pegtl/internal/cr_eol.hpp → ...sa/extern/pegtl/pegtl/internal/cr_eol.hpp b/lib/pegtl/internal/cr_eol.hpp → ...sa/extern/pegtl/pegtl/internal/cr_eol.hpp
diff --git a/lib/pegtl/internal/crlf_eol.hpp → .../extern/pegtl/pegtl/internal/crlf_eol.hpp b/lib/pegtl/internal/crlf_eol.hpp → .../extern/pegtl/pegtl/internal/crlf_eol.hpp
diff --git a/lib/pegtl/internal/cstream_reader.hpp → ...n/pegtl/pegtl/internal/cstream_reader.hpp b/lib/pegtl/internal/cstream_reader.hpp → ...n/pegtl/pegtl/internal/cstream_reader.hpp
diff --git a/lib/pegtl/internal/cstring_reader.hpp → ...n/pegtl/pegtl/internal/cstring_reader.hpp b/lib/pegtl/internal/cstring_reader.hpp → ...n/pegtl/pegtl/internal/cstring_reader.hpp
diff --git a/lib/pegtl/internal/demangle.hpp → .../extern/pegtl/pegtl/internal/demangle.hpp b/lib/pegtl/internal/demangle.hpp → .../extern/pegtl/pegtl/internal/demangle.hpp
diff --git a/lib/pegtl/internal/demangle_cxxabi.hpp → .../pegtl/pegtl/internal/demangle_cxxabi.hpp b/lib/pegtl/internal/demangle_cxxabi.hpp → .../pegtl/pegtl/internal/demangle_cxxabi.hpp
diff --git a/lib/pegtl/internal/demangle_nop.hpp → ...ern/pegtl/pegtl/internal/demangle_nop.hpp b/lib/pegtl/internal/demangle_nop.hpp → ...ern/pegtl/pegtl/internal/demangle_nop.hpp
diff --git a/lib/pegtl/internal/demangle_sanitise.hpp → ...egtl/pegtl/internal/demangle_sanitise.hpp b/lib/pegtl/internal/demangle_sanitise.hpp → ...egtl/pegtl/internal/demangle_sanitise.hpp
diff --git a/lib/pegtl/internal/disable.hpp → ...a/extern/pegtl/pegtl/internal/disable.hpp b/lib/pegtl/internal/disable.hpp → ...a/extern/pegtl/pegtl/internal/disable.hpp
diff --git a/lib/pegtl/internal/discard.hpp → ...a/extern/pegtl/pegtl/internal/discard.hpp b/lib/pegtl/internal/discard.hpp → ...a/extern/pegtl/pegtl/internal/discard.hpp
diff --git a/lib/pegtl/internal/dusel_mode.hpp → ...xtern/pegtl/pegtl/internal/dusel_mode.hpp b/lib/pegtl/internal/dusel_mode.hpp → ...xtern/pegtl/pegtl/internal/dusel_mode.hpp
diff --git a/lib/pegtl/internal/duseltronik.hpp → ...tern/pegtl/pegtl/internal/duseltronik.hpp b/lib/pegtl/internal/duseltronik.hpp → ...tern/pegtl/pegtl/internal/duseltronik.hpp
diff --git a/lib/pegtl/internal/enable.hpp → ...sa/extern/pegtl/pegtl/internal/enable.hpp b/lib/pegtl/internal/enable.hpp → ...sa/extern/pegtl/pegtl/internal/enable.hpp
diff --git a/lib/pegtl/internal/endian.hpp → ...sa/extern/pegtl/pegtl/internal/endian.hpp b/lib/pegtl/internal/endian.hpp → ...sa/extern/pegtl/pegtl/internal/endian.hpp
diff --git a/lib/pegtl/internal/endian_gcc.hpp → ...xtern/pegtl/pegtl/internal/endian_gcc.hpp b/lib/pegtl/internal/endian_gcc.hpp → ...xtern/pegtl/pegtl/internal/endian_gcc.hpp
diff --git a/lib/pegtl/internal/endian_win.hpp → ...xtern/pegtl/pegtl/internal/endian_win.hpp b/lib/pegtl/internal/endian_win.hpp → ...xtern/pegtl/pegtl/internal/endian_win.hpp
diff --git a/lib/pegtl/internal/eof.hpp → libursa/extern/pegtl/pegtl/internal/eof.hpp b/lib/pegtl/internal/eof.hpp → libursa/extern/pegtl/pegtl/internal/eof.hpp
diff --git a/lib/pegtl/internal/eol.hpp → libursa/extern/pegtl/pegtl/internal/eol.hpp b/lib/pegtl/internal/eol.hpp → libursa/extern/pegtl/pegtl/internal/eol.hpp
diff --git a/lib/pegtl/internal/eolf.hpp → libursa/extern/pegtl/pegtl/internal/eolf.hpp b/lib/pegtl/internal/eolf.hpp → libursa/extern/pegtl/pegtl/internal/eolf.hpp
diff --git a/lib/pegtl/internal/file_mapper.hpp → ...tern/pegtl/pegtl/internal/file_mapper.hpp b/lib/pegtl/internal/file_mapper.hpp → ...tern/pegtl/pegtl/internal/file_mapper.hpp
diff --git a/lib/pegtl/internal/file_opener.hpp → ...tern/pegtl/pegtl/internal/file_opener.hpp b/lib/pegtl/internal/file_opener.hpp → ...tern/pegtl/pegtl/internal/file_opener.hpp
diff --git a/lib/pegtl/internal/file_reader.hpp → ...tern/pegtl/pegtl/internal/file_reader.hpp b/lib/pegtl/internal/file_reader.hpp → ...tern/pegtl/pegtl/internal/file_reader.hpp
diff --git a/lib/pegtl/internal/has_apply.hpp → ...extern/pegtl/pegtl/internal/has_apply.hpp b/lib/pegtl/internal/has_apply.hpp → ...extern/pegtl/pegtl/internal/has_apply.hpp
diff --git a/lib/pegtl/internal/has_apply0.hpp → ...xtern/pegtl/pegtl/internal/has_apply0.hpp b/lib/pegtl/internal/has_apply0.hpp → ...xtern/pegtl/pegtl/internal/has_apply0.hpp
diff --git a/lib/pegtl/internal/identifier.hpp → ...xtern/pegtl/pegtl/internal/identifier.hpp b/lib/pegtl/internal/identifier.hpp → ...xtern/pegtl/pegtl/internal/identifier.hpp
diff --git a/lib/pegtl/internal/if_apply.hpp → .../extern/pegtl/pegtl/internal/if_apply.hpp b/lib/pegtl/internal/if_apply.hpp → .../extern/pegtl/pegtl/internal/if_apply.hpp
diff --git a/lib/pegtl/internal/if_must.hpp → ...a/extern/pegtl/pegtl/internal/if_must.hpp b/lib/pegtl/internal/if_must.hpp → ...a/extern/pegtl/pegtl/internal/if_must.hpp
diff --git a/lib/pegtl/internal/if_must_else.hpp → ...ern/pegtl/pegtl/internal/if_must_else.hpp b/lib/pegtl/internal/if_must_else.hpp → ...ern/pegtl/pegtl/internal/if_must_else.hpp
diff --git a/lib/pegtl/internal/if_then_else.hpp → ...ern/pegtl/pegtl/internal/if_then_else.hpp b/lib/pegtl/internal/if_then_else.hpp → ...ern/pegtl/pegtl/internal/if_then_else.hpp
diff --git a/lib/pegtl/internal/input_pair.hpp → ...xtern/pegtl/pegtl/internal/input_pair.hpp b/lib/pegtl/internal/input_pair.hpp → ...xtern/pegtl/pegtl/internal/input_pair.hpp
diff --git a/lib/pegtl/internal/integer_sequence.hpp → ...pegtl/pegtl/internal/integer_sequence.hpp b/lib/pegtl/internal/integer_sequence.hpp → ...pegtl/pegtl/internal/integer_sequence.hpp
diff --git a/lib/pegtl/internal/istream_reader.hpp → ...n/pegtl/pegtl/internal/istream_reader.hpp b/lib/pegtl/internal/istream_reader.hpp → ...n/pegtl/pegtl/internal/istream_reader.hpp
diff --git a/lib/pegtl/internal/istring.hpp → ...a/extern/pegtl/pegtl/internal/istring.hpp b/lib/pegtl/internal/istring.hpp → ...a/extern/pegtl/pegtl/internal/istring.hpp
diff --git a/lib/pegtl/internal/iterator.hpp → .../extern/pegtl/pegtl/internal/iterator.hpp b/lib/pegtl/internal/iterator.hpp → .../extern/pegtl/pegtl/internal/iterator.hpp
diff --git a/lib/pegtl/internal/lf_crlf_eol.hpp → ...tern/pegtl/pegtl/internal/lf_crlf_eol.hpp b/lib/pegtl/internal/lf_crlf_eol.hpp → ...tern/pegtl/pegtl/internal/lf_crlf_eol.hpp
diff --git a/lib/pegtl/internal/lf_eol.hpp → ...sa/extern/pegtl/pegtl/internal/lf_eol.hpp b/lib/pegtl/internal/lf_eol.hpp → ...sa/extern/pegtl/pegtl/internal/lf_eol.hpp
diff --git a/lib/pegtl/internal/list.hpp → libursa/extern/pegtl/pegtl/internal/list.hpp b/lib/pegtl/internal/list.hpp → libursa/extern/pegtl/pegtl/internal/list.hpp
diff --git a/lib/pegtl/internal/list_must.hpp → ...extern/pegtl/pegtl/internal/list_must.hpp b/lib/pegtl/internal/list_must.hpp → ...extern/pegtl/pegtl/internal/list_must.hpp
diff --git a/lib/pegtl/internal/list_tail.hpp → ...extern/pegtl/pegtl/internal/list_tail.hpp b/lib/pegtl/internal/list_tail.hpp → ...extern/pegtl/pegtl/internal/list_tail.hpp
diff --git a/lib/pegtl/internal/list_tail_pad.hpp → ...rn/pegtl/pegtl/internal/list_tail_pad.hpp b/lib/pegtl/internal/list_tail_pad.hpp → ...rn/pegtl/pegtl/internal/list_tail_pad.hpp
diff --git a/lib/pegtl/internal/marker.hpp → ...sa/extern/pegtl/pegtl/internal/marker.hpp b/lib/pegtl/internal/marker.hpp → ...sa/extern/pegtl/pegtl/internal/marker.hpp
diff --git a/lib/pegtl/internal/minus.hpp → ...rsa/extern/pegtl/pegtl/internal/minus.hpp b/lib/pegtl/internal/minus.hpp → ...rsa/extern/pegtl/pegtl/internal/minus.hpp
diff --git a/lib/pegtl/internal/must.hpp → libursa/extern/pegtl/pegtl/internal/must.hpp b/lib/pegtl/internal/must.hpp → libursa/extern/pegtl/pegtl/internal/must.hpp
diff --git a/lib/pegtl/internal/not_at.hpp → ...sa/extern/pegtl/pegtl/internal/not_at.hpp b/lib/pegtl/internal/not_at.hpp → ...sa/extern/pegtl/pegtl/internal/not_at.hpp
diff --git a/lib/pegtl/internal/one.hpp → libursa/extern/pegtl/pegtl/internal/one.hpp b/lib/pegtl/internal/one.hpp → libursa/extern/pegtl/pegtl/internal/one.hpp
diff --git a/lib/pegtl/internal/opt.hpp → libursa/extern/pegtl/pegtl/internal/opt.hpp b/lib/pegtl/internal/opt.hpp → libursa/extern/pegtl/pegtl/internal/opt.hpp
diff --git a/lib/pegtl/internal/pad.hpp → libursa/extern/pegtl/pegtl/internal/pad.hpp b/lib/pegtl/internal/pad.hpp → libursa/extern/pegtl/pegtl/internal/pad.hpp
diff --git a/lib/pegtl/internal/pad_opt.hpp → ...a/extern/pegtl/pegtl/internal/pad_opt.hpp b/lib/pegtl/internal/pad_opt.hpp → ...a/extern/pegtl/pegtl/internal/pad_opt.hpp
diff --git a/lib/pegtl/internal/peek_char.hpp → ...extern/pegtl/pegtl/internal/peek_char.hpp b/lib/pegtl/internal/peek_char.hpp → ...extern/pegtl/pegtl/internal/peek_char.hpp
diff --git a/lib/pegtl/internal/peek_mask_uint.hpp → ...n/pegtl/pegtl/internal/peek_mask_uint.hpp b/lib/pegtl/internal/peek_mask_uint.hpp → ...n/pegtl/pegtl/internal/peek_mask_uint.hpp
diff --git a/lib/pegtl/internal/peek_mask_uint8.hpp → .../pegtl/pegtl/internal/peek_mask_uint8.hpp b/lib/pegtl/internal/peek_mask_uint8.hpp → .../pegtl/pegtl/internal/peek_mask_uint8.hpp
diff --git a/lib/pegtl/internal/peek_uint.hpp → ...extern/pegtl/pegtl/internal/peek_uint.hpp b/lib/pegtl/internal/peek_uint.hpp → ...extern/pegtl/pegtl/internal/peek_uint.hpp
diff --git a/lib/pegtl/internal/peek_uint8.hpp → ...xtern/pegtl/pegtl/internal/peek_uint8.hpp b/lib/pegtl/internal/peek_uint8.hpp → ...xtern/pegtl/pegtl/internal/peek_uint8.hpp
diff --git a/lib/pegtl/internal/peek_utf16.hpp → ...xtern/pegtl/pegtl/internal/peek_utf16.hpp b/lib/pegtl/internal/peek_utf16.hpp → ...xtern/pegtl/pegtl/internal/peek_utf16.hpp
diff --git a/lib/pegtl/internal/peek_utf32.hpp → ...xtern/pegtl/pegtl/internal/peek_utf32.hpp b/lib/pegtl/internal/peek_utf32.hpp → ...xtern/pegtl/pegtl/internal/peek_utf32.hpp
diff --git a/lib/pegtl/internal/peek_utf8.hpp → ...extern/pegtl/pegtl/internal/peek_utf8.hpp b/lib/pegtl/internal/peek_utf8.hpp → ...extern/pegtl/pegtl/internal/peek_utf8.hpp
diff --git a/lib/pegtl/internal/pegtl_string.hpp → ...ern/pegtl/pegtl/internal/pegtl_string.hpp b/lib/pegtl/internal/pegtl_string.hpp → ...ern/pegtl/pegtl/internal/pegtl_string.hpp
diff --git a/lib/pegtl/internal/plus.hpp → libursa/extern/pegtl/pegtl/internal/plus.hpp b/lib/pegtl/internal/plus.hpp → libursa/extern/pegtl/pegtl/internal/plus.hpp
diff --git a/lib/pegtl/internal/raise.hpp → ...rsa/extern/pegtl/pegtl/internal/raise.hpp b/lib/pegtl/internal/raise.hpp → ...rsa/extern/pegtl/pegtl/internal/raise.hpp
diff --git a/lib/pegtl/internal/range.hpp → ...rsa/extern/pegtl/pegtl/internal/range.hpp b/lib/pegtl/internal/range.hpp → ...rsa/extern/pegtl/pegtl/internal/range.hpp
diff --git a/lib/pegtl/internal/ranges.hpp → ...sa/extern/pegtl/pegtl/internal/ranges.hpp b/lib/pegtl/internal/ranges.hpp → ...sa/extern/pegtl/pegtl/internal/ranges.hpp
diff --git a/lib/pegtl/internal/read_uint.hpp → ...extern/pegtl/pegtl/internal/read_uint.hpp b/lib/pegtl/internal/read_uint.hpp → ...extern/pegtl/pegtl/internal/read_uint.hpp
diff --git a/lib/pegtl/internal/rep.hpp → libursa/extern/pegtl/pegtl/internal/rep.hpp b/lib/pegtl/internal/rep.hpp → libursa/extern/pegtl/pegtl/internal/rep.hpp
diff --git a/lib/pegtl/internal/rep_min.hpp → ...a/extern/pegtl/pegtl/internal/rep_min.hpp b/lib/pegtl/internal/rep_min.hpp → ...a/extern/pegtl/pegtl/internal/rep_min.hpp
diff --git a/lib/pegtl/internal/rep_min_max.hpp → ...tern/pegtl/pegtl/internal/rep_min_max.hpp b/lib/pegtl/internal/rep_min_max.hpp → ...tern/pegtl/pegtl/internal/rep_min_max.hpp
diff --git a/lib/pegtl/internal/rep_opt.hpp → ...a/extern/pegtl/pegtl/internal/rep_opt.hpp b/lib/pegtl/internal/rep_opt.hpp → ...a/extern/pegtl/pegtl/internal/rep_opt.hpp
diff --git a/lib/pegtl/internal/require.hpp → ...a/extern/pegtl/pegtl/internal/require.hpp b/lib/pegtl/internal/require.hpp → ...a/extern/pegtl/pegtl/internal/require.hpp
diff --git a/lib/pegtl/internal/result_on_found.hpp → .../pegtl/pegtl/internal/result_on_found.hpp b/lib/pegtl/internal/result_on_found.hpp → .../pegtl/pegtl/internal/result_on_found.hpp
diff --git a/lib/pegtl/internal/rule_conjunction.hpp → ...pegtl/pegtl/internal/rule_conjunction.hpp b/lib/pegtl/internal/rule_conjunction.hpp → ...pegtl/pegtl/internal/rule_conjunction.hpp
diff --git a/lib/pegtl/internal/rules.hpp → ...rsa/extern/pegtl/pegtl/internal/rules.hpp b/lib/pegtl/internal/rules.hpp → ...rsa/extern/pegtl/pegtl/internal/rules.hpp
diff --git a/lib/pegtl/internal/seq.hpp → libursa/extern/pegtl/pegtl/internal/seq.hpp b/lib/pegtl/internal/seq.hpp → libursa/extern/pegtl/pegtl/internal/seq.hpp
diff --git a/lib/pegtl/internal/skip_control.hpp → ...ern/pegtl/pegtl/internal/skip_control.hpp b/lib/pegtl/internal/skip_control.hpp → ...ern/pegtl/pegtl/internal/skip_control.hpp
diff --git a/lib/pegtl/internal/sor.hpp → libursa/extern/pegtl/pegtl/internal/sor.hpp b/lib/pegtl/internal/sor.hpp → libursa/extern/pegtl/pegtl/internal/sor.hpp
diff --git a/lib/pegtl/internal/star.hpp → libursa/extern/pegtl/pegtl/internal/star.hpp b/lib/pegtl/internal/star.hpp → libursa/extern/pegtl/pegtl/internal/star.hpp
diff --git a/lib/pegtl/internal/star_must.hpp → ...extern/pegtl/pegtl/internal/star_must.hpp b/lib/pegtl/internal/star_must.hpp → ...extern/pegtl/pegtl/internal/star_must.hpp
diff --git a/lib/pegtl/internal/state.hpp → ...rsa/extern/pegtl/pegtl/internal/state.hpp b/lib/pegtl/internal/state.hpp → ...rsa/extern/pegtl/pegtl/internal/state.hpp
diff --git a/lib/pegtl/internal/string.hpp → ...sa/extern/pegtl/pegtl/internal/string.hpp b/lib/pegtl/internal/string.hpp → ...sa/extern/pegtl/pegtl/internal/string.hpp
diff --git a/lib/pegtl/internal/trivial.hpp → ...a/extern/pegtl/pegtl/internal/trivial.hpp b/lib/pegtl/internal/trivial.hpp → ...a/extern/pegtl/pegtl/internal/trivial.hpp
diff --git a/lib/pegtl/internal/try_catch_type.hpp → ...n/pegtl/pegtl/internal/try_catch_type.hpp b/lib/pegtl/internal/try_catch_type.hpp → ...n/pegtl/pegtl/internal/try_catch_type.hpp
diff --git a/lib/pegtl/internal/until.hpp → ...rsa/extern/pegtl/pegtl/internal/until.hpp b/lib/pegtl/internal/until.hpp → ...rsa/extern/pegtl/pegtl/internal/until.hpp
diff --git a/lib/pegtl/istream_input.hpp → libursa/extern/pegtl/pegtl/istream_input.hpp b/lib/pegtl/istream_input.hpp → libursa/extern/pegtl/pegtl/istream_input.hpp
diff --git a/lib/pegtl/memory_input.hpp → libursa/extern/pegtl/pegtl/memory_input.hpp b/lib/pegtl/memory_input.hpp → libursa/extern/pegtl/pegtl/memory_input.hpp
diff --git a/lib/pegtl/mmap_input.hpp → libursa/extern/pegtl/pegtl/mmap_input.hpp b/lib/pegtl/mmap_input.hpp → libursa/extern/pegtl/pegtl/mmap_input.hpp
diff --git a/lib/pegtl/normal.hpp → libursa/extern/pegtl/pegtl/normal.hpp b/lib/pegtl/normal.hpp → libursa/extern/pegtl/pegtl/normal.hpp
diff --git a/lib/pegtl/nothing.hpp → libursa/extern/pegtl/pegtl/nothing.hpp b/lib/pegtl/nothing.hpp → libursa/extern/pegtl/pegtl/nothing.hpp
diff --git a/lib/pegtl/parse.hpp → libursa/extern/pegtl/pegtl/parse.hpp b/lib/pegtl/parse.hpp → libursa/extern/pegtl/pegtl/parse.hpp
diff --git a/lib/pegtl/parse_error.hpp → libursa/extern/pegtl/pegtl/parse_error.hpp b/lib/pegtl/parse_error.hpp → libursa/extern/pegtl/pegtl/parse_error.hpp
diff --git a/lib/pegtl/position.hpp → libursa/extern/pegtl/pegtl/position.hpp b/lib/pegtl/position.hpp → libursa/extern/pegtl/pegtl/position.hpp
diff --git a/lib/pegtl/read_input.hpp → libursa/extern/pegtl/pegtl/read_input.hpp b/lib/pegtl/read_input.hpp → libursa/extern/pegtl/pegtl/read_input.hpp
diff --git a/lib/pegtl/rewind_mode.hpp → libursa/extern/pegtl/pegtl/rewind_mode.hpp b/lib/pegtl/rewind_mode.hpp → libursa/extern/pegtl/pegtl/rewind_mode.hpp
diff --git a/lib/pegtl/rules.hpp → libursa/extern/pegtl/pegtl/rules.hpp b/lib/pegtl/rules.hpp → libursa/extern/pegtl/pegtl/rules.hpp
diff --git a/lib/pegtl/string_input.hpp → libursa/extern/pegtl/pegtl/string_input.hpp b/lib/pegtl/string_input.hpp → libursa/extern/pegtl/pegtl/string_input.hpp
diff --git a/lib/pegtl/tracking_mode.hpp → libursa/extern/pegtl/pegtl/tracking_mode.hpp b/lib/pegtl/tracking_mode.hpp → libursa/extern/pegtl/pegtl/tracking_mode.hpp
diff --git a/lib/pegtl/uint16.hpp → libursa/extern/pegtl/pegtl/uint16.hpp b/lib/pegtl/uint16.hpp → libursa/extern/pegtl/pegtl/uint16.hpp
diff --git a/lib/pegtl/uint32.hpp → libursa/extern/pegtl/pegtl/uint32.hpp b/lib/pegtl/uint32.hpp → libursa/extern/pegtl/pegtl/uint32.hpp
diff --git a/lib/pegtl/uint64.hpp → libursa/extern/pegtl/pegtl/uint64.hpp b/lib/pegtl/uint64.hpp → libursa/extern/pegtl/pegtl/uint64.hpp
diff --git a/lib/pegtl/uint8.hpp → libursa/extern/pegtl/pegtl/uint8.hpp b/lib/pegtl/uint8.hpp → libursa/extern/pegtl/pegtl/uint8.hpp
diff --git a/lib/pegtl/utf16.hpp → libursa/extern/pegtl/pegtl/utf16.hpp b/lib/pegtl/utf16.hpp → libursa/extern/pegtl/pegtl/utf16.hpp
diff --git a/lib/pegtl/utf32.hpp → libursa/extern/pegtl/pegtl/utf32.hpp b/lib/pegtl/utf32.hpp → libursa/extern/pegtl/pegtl/utf32.hpp
diff --git a/lib/pegtl/utf8.hpp → libursa/extern/pegtl/pegtl/utf8.hpp b/lib/pegtl/utf8.hpp → libursa/extern/pegtl/pegtl/utf8.hpp
diff --git a/lib/pegtl/version.hpp → libursa/extern/pegtl/pegtl/version.hpp b/lib/pegtl/version.hpp → libursa/extern/pegtl/pegtl/version.hpp
diff --git a/Benchmark.cpp → src/Benchmark.cpp b/Benchmark.cpp → src/Benchmark.cpp
@@ -8,9 +8,9 @@
 #include <random>
 #include <vector>
 
-#include "Core.h"
-#include "Database.h"
-#include "Utils.h"
+#include "libursa/Core.h"
+#include "libursa/Database.h"
+#include "libursa/Utils.h"
 
 template <typename F, typename... Args>
 static uint64_t benchmark_ms(F &&func, Args &&... args) {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,22 @@
+add_executable(ursadb Daemon.cpp
+                      Daemon.h
+                      NetworkService.cpp
+                      NetworkService.h)
+target_link_libraries(ursadb ursa)
+target_clangformat_setup(ursadb)
+
+add_executable(ursadb_new NewDatabase.cpp)
+target_link_libraries(ursadb_new ursa)
+target_clangformat_setup(ursadb_new)
+
+add_executable(ursadb_trim Trim.cpp)
+target_link_libraries(ursadb_trim ursa)
+target_clangformat_setup(ursadb_trim)
+
+add_executable(ursadb_test Tests.cpp)
+target_link_libraries(ursadb_test ursa)
+target_clangformat_setup(ursadb_test)
+
+add_executable(ursadb_bench Benchmark.cpp)
+target_link_libraries(ursadb_bench ursa)
+target_clangformat_setup(ursadb_bench)
diff --git a/lib/Catch.h → src/Catch.h b/lib/Catch.h → src/Catch.h
diff --git a/Daemon.cpp → src/Daemon.cpp b/Daemon.cpp → src/Daemon.cpp
@@ -13,14 +13,14 @@
 #include <vector>
 #include <zmq.hpp>
 
-#include "Command.h"
-#include "Database.h"
-#include "DatasetBuilder.h"
+#include "libursa/Command.h"
+#include "libursa/Database.h"
+#include "libursa/DatasetBuilder.h"
+#include "libursa/OnDiskDataset.h"
+#include "libursa/QueryParser.h"
+#include "libursa/Responses.h"
+#include "libursa/ResultWriter.h"
 #include "NetworkService.h"
-#include "OnDiskDataset.h"
-#include "QueryParser.h"
-#include "Responses.h"
-#include "ResultWriter.h"
 
 Response execute_command(const SelectCommand &cmd, Task *task,
                          const DatabaseSnapshot *snap) {

diff --git a/Daemon.h → src/Daemon.h b/Daemon.h → src/Daemon.h
@@ -2,9 +2,9 @@
 
 #include <string>
 
-#include "DatabaseSnapshot.h"
-#include "Responses.h"
-#include "Task.h"
+#include "libursa/DatabaseSnapshot.h"
+#include "libursa/Responses.h"
+#include "libursa/Task.h"
 
 Response dispatch_command_safe(const std::string &cmd_str, Task *task,
                                const DatabaseSnapshot *snap);
diff --git a/NetworkService.cpp → src/NetworkService.cpp b/NetworkService.cpp → src/NetworkService.cpp
@@ -1,9 +1,9 @@
 #include "NetworkService.h"
 
 #include "Daemon.h"
-#include "DatabaseHandle.h"
-#include "Responses.h"
-#include "ZHelpers.h"
+#include "libursa/DatabaseHandle.h"
+#include "libursa/Responses.h"
+#include "libursa/ZHelpers.h"
 
 [[noreturn]] static void *worker_thread(void *arg) {
     auto *wctx = static_cast<WorkerContext *>(arg);

diff --git a/NetworkService.h → src/NetworkService.h b/NetworkService.h → src/NetworkService.h
@@ -16,7 +16,7 @@
 #include <vector>
 #include <zmq.hpp>
 
-#include "Database.h"
+#include "libursa/Database.h"
 
 constexpr int NUM_WORKERS = 4;
 

diff --git a/NewDatabase.cpp → src/NewDatabase.cpp b/NewDatabase.cpp → src/NewDatabase.cpp
@@ -8,11 +8,11 @@
 #include <vector>
 #include <zmq.hpp>
 
-#include "Command.h"
-#include "Database.h"
-#include "DatasetBuilder.h"
-#include "OnDiskDataset.h"
-#include "QueryParser.h"
+#include "libursa/Command.h"
+#include "libursa/Database.h"
+#include "libursa/DatasetBuilder.h"
+#include "libursa/OnDiskDataset.h"
+#include "libursa/QueryParser.h"
 
 int main(int argc, char *argv[]) {
     if (argc < 2) {

diff --git a/Tests.cpp → src/Tests.cpp b/Tests.cpp → src/Tests.cpp
@@ -3,16 +3,16 @@
 #include <cstdlib>
 #include <variant>
 
-#include "BitmapIndexBuilder.h"
-#include "FlatIndexBuilder.h"
-#include "IndexBuilder.h"
-#include "OnDiskDataset.h"
-#include "OnDiskIndex.h"
-#include "Query.h"
-#include "QueryParser.h"
-#include "ResultWriter.h"
-#include "Utils.h"
-#include "lib/Catch.h"
+#include "libursa/BitmapIndexBuilder.h"
+#include "libursa/FlatIndexBuilder.h"
+#include "libursa/IndexBuilder.h"
+#include "libursa/OnDiskDataset.h"
+#include "libursa/OnDiskIndex.h"
+#include "libursa/Query.h"
+#include "libursa/QueryParser.h"
+#include "libursa/ResultWriter.h"
+#include "libursa/Utils.h"
+#include "Catch.h"
 
 TriGram gram3_pack(const char (&s)[4]) {
     TriGram v0 = (uint8_t)s[0];

diff --git a/Trim.cpp → src/Trim.cpp b/Trim.cpp → src/Trim.cpp
@@ -8,11 +8,11 @@
 #include <vector>
 #include <zmq.hpp>
 
-#include "Command.h"
-#include "Database.h"
-#include "DatasetBuilder.h"
-#include "OnDiskDataset.h"
-#include "QueryParser.h"
+#include "libursa/Command.h"
+#include "libursa/Database.h"
+#include "libursa/DatasetBuilder.h"
+#include "libursa/OnDiskDataset.h"
+#include "libursa/QueryParser.h"
 
 static bool endsWith(const std::string &str, const std::string &suffix) {
     return str.size() >= suffix.size() &&