Merge branch 'static/linenoise'

Author: sourrust

CMakeLists.txt

@@ -48,4 +48,8 @@ configure_file(
   "${laco_SOURCE_DIR}/src/lacoconf.h.in"
   "${laco_BINARY_DIR}/include/lacoconf.h")
 
+# for linenoise library
+include_directories("${laco_SOURCE_DIR}/deps/linenoise")
+add_subdirectory(deps)
+
 add_subdirectory(src)

deps/CMakeLists.txt

@@ -0,0 +1,3 @@
+set(SOURCE linenoise/linenoise.c)
+
+add_library(linenoise STATIC ${SOURCE})

src/CMakeLists.txt

@@ -1,15 +1,11 @@
-set(DEPS_DIR "${laco_SOURCE_DIR}/deps")
+include_directories("${laco_SOURCE_DIR}/src")
 
-include_directories("${laco_SOURCE_DIR}/src" "${DEPS_DIR}/linenoise")
-
-set(SOURCE ${DEPS_DIR}/linenoise/linenoise.c
-           main.c util.c util/print.c
-           util/line.c
-           commands/debugger.c
-           flags.c commands.c laco.c)
+set(SOURCE main.c flags.c laco.c
+           util.c util/print.c util/line.c
+           commands.c commands/debugger.c)
 
 add_executable(laco ${SOURCE})
-target_link_libraries(laco ${LACO_LUA})
+target_link_libraries(laco ${LACO_LUA} linenoise)
 
 install(TARGETS laco
   RUNTIME DESTINATION bin)

src/commands.c

@@ -7,11 +7,11 @@
 #include "util.h"
 #include "commands/debugger.h"
 
-static const char* quit_matches[] = {"quit", "q"};
-static const char* help_matches[] = {"help", "?"};
+static const char* quit_matches[] = {"quit", "q", NULL};
+static const char* help_matches[] = {"help", "?", NULL};
 
 /* Debugger commands */
-static const char* debug_info_matches[] = {"info"};
+static const char* debug_info_matches[] = {"info", NULL};
 
 static void print_commands_help() {
   puts("  Commands available:\n");

src/flags.c

@@ -10,8 +10,8 @@ enum LacoFlags {
   LACO_VERSION
 };
 
-static const char* version_matches[] = {"-v", "--version"};
-static const char* help_matches[]    = {"-h", "-?", "--help"};
+static const char* version_matches[] = {"-v", "--version", NULL};
+static const char* help_matches[]    = {"-h", "-?", "--help", NULL};
 
 /* Check if the command flag is for version */
 static inline bool is_version(const char* arg) {