tools: add strlcpy() and strlcat() dependency

Closes #2436.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

src/lxc/Makefile.am

@@ -287,6 +287,54 @@ lxc_wait_SOURCES = tools/lxc_wait.c tools/arguments.c tools/tool_utils.c
 lxc_create_SOURCES = tools/lxc_create.c tools/arguments.c tools/tool_utils.c
 lxc_snapshot_SOURCES = tools/lxc_snapshot.c tools/arguments.c tools/tool_utils.c
 lxc_checkpoint_SOURCES = tools/lxc_checkpoint.c tools/arguments.c tools/tool_utils.c
+if !HAVE_STRLCPY
+lxc_attach_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_autostart_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_cgroup_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_config_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_console_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_destroy_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_device_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_execute_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_freeze_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_info_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_monitor_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_ls_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_copy_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_start_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_stop_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_top_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_unfreeze_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_unshare_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_wait_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_create_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_snapshot_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+lxc_checkpoint_SOURCES += ../include/strlcpy.c ../include/strlcpy.h
+endif
+if !HAVE_STRLCAT
+lxc_attach_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_autostart_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_cgroup_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_config_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_console_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_destroy_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_device_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_execute_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_freeze_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_info_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_monitor_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_ls_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_copy_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_start_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_stop_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_top_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_unfreeze_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_unshare_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_wait_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_create_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_snapshot_SOURCES += ../include/strlcat.c ../include/strlcat.h
+lxc_checkpoint_SOURCES += ../include/strlcat.c ../include/strlcat.h
+endif
 endif
 
 if ENABLE_COMMANDS

src/lxc/tools/tool_utils.c

@@ -49,11 +49,11 @@
 #include "tool_utils.h"
 
 #ifndef HAVE_STRLCPY
-#include "include/strlcpy.h"
+#include "../../include/strlcpy.h"
 #endif
 
 #ifndef HAVE_STRLCAT
-#include "include/strlcat.h"
+#include "../../include/strlcat.h"
 #endif
 
 int lxc_fill_elevated_privileges(char *flaglist, int *flags)