From: 2xsec <dh48.jeong@samsung.com>
Date: Fri, 29 Jun 2018 05:48:34 +0000 (+0900)
Subject: tools: lxc-config: share internal API symbols
X-Git-Tag: lxc-3.1.0~225^2~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b27cdf66dcfbf294159dbe380073507fb9be53be;p=thirdparty%2Flxc.git

tools: lxc-config: share internal API symbols

Signed-off-by: 2xsec <dh48.jeong@samsung.com>
---

diff --git a/src/lxc/Makefile.am b/src/lxc/Makefile.am
index cfaab8edb..f5ee8b17c 100644
--- a/src/lxc/Makefile.am
+++ b/src/lxc/Makefile.am
@@ -268,7 +268,7 @@ if ENABLE_TOOLS
 lxc_attach_SOURCES = tools/lxc_attach.c tools/arguments.c
 lxc_autostart_SOURCES = tools/lxc_autostart.c tools/arguments.c
 lxc_cgroup_SOURCES = tools/lxc_cgroup.c tools/arguments.c
-lxc_config_SOURCES = tools/lxc_config.c tools/arguments.c tools/tool_utils.c
+lxc_config_SOURCES = tools/lxc_config.c tools/arguments.c
 lxc_console_SOURCES = tools/lxc_console.c tools/arguments.c tools/tool_utils.c
 lxc_destroy_SOURCES = tools/lxc_destroy.c tools/arguments.c tools/tool_utils.c
 lxc_device_SOURCES = tools/lxc_device.c tools/arguments.c tools/tool_utils.c
diff --git a/src/lxc/tools/lxc_config.c b/src/lxc/tools/lxc_config.c
index 775923e34..b1f99c574 100644
--- a/src/lxc/tools/lxc_config.c
+++ b/src/lxc/tools/lxc_config.c
@@ -52,6 +52,7 @@ static void list_config_items(void)
 
 	for (i = &items[0]; i->name; i++)
 		printf("%s\n", i->name);
+
 	exit(EXIT_SUCCESS);
 }
 
@@ -60,21 +61,25 @@ int main(int argc, char *argv[])
 	struct lxc_config_items *i;
 	const char *value;
 
-	if (argc < 2 || strcmp(argv[1], "-h") == 0 ||
-			strcmp(argv[1], "--help") == 0)
+	if (argc < 2 || !strncmp(argv[1], "-h", strlen(argv[1])) ||
+	                !strncmp(argv[1], "--help", strlen(argv[1])))
 		usage(argv[0]);
-	if (strcmp(argv[1], "-l") == 0)
+
+	if (!strncmp(argv[1], "-l", strlen(argv[1])))
 		list_config_items();
+
 	for (i = &items[0]; i->name; i++) {
-		if (strcmp(argv[1], i->name) == 0) {
+		if (!strncmp(argv[1], i->name, strlen(argv[1]))) {
 			value = lxc_get_global_config_item(i->name);
 			if (value)
 				printf("%s\n", value);
 			else
 				printf("%s is not set.\n", argv[1]);
+
 			exit(EXIT_SUCCESS);
 		}
 	}
+
 	printf("Unknown configuration item: %s\n", argv[1]);
 	exit(EXIT_FAILURE);
 }