Use portable getline

diff --git a/.gitmodules b/.gitmodules
index 6404413c83f38c6672380d99e1ae2e956e2ad71e..49df65fad72fb679e41359d134b3f9ea529da36e 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
 [submodule "deps/protogen"]
        path = deps/protogen
        url = https://github.com/dragonblocks/protogen
+[submodule "deps/getline"]
+       path = deps/getline
+       url = https://github.com/dragonblocks/getline

diff --git a/deps/getline b/deps/getline
new file mode 160000 (submodule)
index 0000000..9d102be
--- /dev/null
+++ b/deps/getline
@@ -0,0 +1 @@
+Subproject commit 9d102be3fb622bcd3fab9f7feaafe2b1abf3980a

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6b28b7f2c5c870a97e8ef37186775b0b3228ec0a..896d84537a3078c66ca4163845d38253368952d6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -46,7 +46,7 @@ endif()
 add_compile_definitions("USE_DRAGONNET")
 add_compile_definitions("RESSOURCE_PATH=\"${RESSOURCE_PATH}\"")
 
-add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -Wno-implicit-fallthrough -fmax-errors=4)
+add_compile_options(-Wall -Wextra -Werror -Wno-address-of-packed-member -Wno-implicit-fallthrough -Wno-unused-parameter -Wno-maybe-uninitialized -fmax-errors=4)
 
 link_libraries(
        pthread
@@ -90,6 +90,7 @@ set(COMMON_SOURCES
        "${DEPS_DIR}/dragonstd/refcount.c"
        "${DEPS_DIR}/dragonstd/tree.c"
        "${DEPS_DIR}/dragonstd/bits/compare.c"
+       "${DEPS_DIR}/getline/getline.c"
        "${DEPS_DIR}/linenoise/linenoise.c"
        "${DEPS_DIR}/linenoise/stringbuf.c"
        "${DEPS_DIR}/linenoise/utf8.c"

diff --git a/src/client/mesh.c b/src/client/mesh.c
index d778ce11a5c0ca5de5b5ccf2e47bb0f8fb90bf2d..1674da00b4db3bedbed407fb396c11d810718b8d 100644 (file)
--- a/src/client/mesh.c
+++ b/src/client/mesh.c
@@ -1,4 +1,5 @@
 #include <dragonstd/tree.h>
+#include <getline/getline.h>
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/src/client/model.c b/src/client/model.c
index f2a224402ea6c54ac97d7524e67353080991fb8a..1755bd96c08e9147158aaa31b6f5af02e73378a0 100644 (file)
--- a/src/client/model.c
+++ b/src/client/model.c
@@ -1,4 +1,5 @@
 #include <dragonstd/tree.h>
+#include <getline/getline.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>

diff --git a/src/server/schematic.c b/src/server/schematic.c
index 9cd92702dd8acb0541aea8bfe31bf2938fa6f838..af92cfa9d4b161b82590c0bac42e299e86b349ff 100644 (file)
--- a/src/server/schematic.c
+++ b/src/server/schematic.c
@@ -1,3 +1,4 @@
+#include <getline/getline.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include "server/schematic.h"