From 227a8c436b2f3a33d7360f2db8e0a4688f251197 Mon Sep 17 00:00:00 2001 From: "Yan, Like" Date: Thu, 20 Sep 2018 09:13:05 +0800 Subject: [PATCH] tools: acrn-manager: fix warnings before updating Makefile - Print warning if string truncated to avoid the warning generated by -Wformat-truncation by GCC 7.0 and newer version; - fixed strncpy size. Tracked-On: #1122 Signed-off-by: Yan, Like Acked-by: Eddie Dong --- tools/acrn-manager/acrn_mngr.c | 5 ++++- tools/acrn-manager/acrnd.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/acrn-manager/acrn_mngr.c b/tools/acrn-manager/acrn_mngr.c index 6d8b79b8f..46cf7a348 100644 --- a/tools/acrn-manager/acrn_mngr.c +++ b/tools/acrn-manager/acrn_mngr.c @@ -479,8 +479,11 @@ static int connect_to_server(const char *name) } mfd->addr.sun_family = AF_UNIX; - snprintf(mfd->addr.sun_path, sizeof(mfd->addr.sun_path), + ret = snprintf(mfd->addr.sun_path, sizeof(mfd->addr.sun_path), "/run/acrn/mngr/%s", s_name); + if ((ret >= 0) && (ret < strlen(s_name))) + printf("WARN: %s is truncated\n", s_name); + closedir(dir); ret = connect(mfd->fd, (struct sockaddr *)&mfd->addr, sizeof(mfd->addr)); diff --git a/tools/acrn-manager/acrnd.c b/tools/acrn-manager/acrnd.c index 33dbb53c5..cf5dcc1ec 100644 --- a/tools/acrn-manager/acrnd.c +++ b/tools/acrn-manager/acrnd.c @@ -175,7 +175,7 @@ static int load_timer_list(void) } memset(arg.name, 0, sizeof(arg.name)); - strncpy(arg.name, s1, sizeof(s1)); + strncpy(arg.name, s1, sizeof(arg.name)); expire = strtoul(s2, NULL, 10); if (expire == 0 || errno == ERANGE) {