From: Phil Sutter <phil@nwl.cc>
Date: Thu, 24 Aug 2017 09:51:48 +0000 (+0200)
Subject: lnstat_util: Simplify alloc_and_open() a bit
X-Git-Tag: v4.13.0~28
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=bc27878d21909b110dd21eea0c3505d023f29dc2;p=mirror_iproute2.git

lnstat_util: Simplify alloc_and_open() a bit

Relying upon callers and using unsafe strcpy() is probably not the best
idea. Aside from that, using snprintf() allows to format the string for
lf->path in one go.

Signed-off-by: Phil Sutter <phil@nwl.cc>
---

diff --git a/misc/lnstat_util.c b/misc/lnstat_util.c
index cc54598f..ec19238c 100644
--- a/misc/lnstat_util.c
+++ b/misc/lnstat_util.c
@@ -180,11 +180,8 @@ static struct lnstat_file *alloc_and_open(const char *path, const char *file)
 	}
 
 	/* initialize */
-	/* de->d_name is guaranteed to be <= NAME_MAX */
-	strcpy(lf->basename, file);
-	strcpy(lf->path, path);
-	strcat(lf->path, "/");
-	strcat(lf->path, lf->basename);
+	snprintf(lf->basename, sizeof(lf->basename), "%s", file);
+	snprintf(lf->path, sizeof(lf->path), "%s/%s", path, file);
 
 	/* initialize to default */
 	lf->interval.tv_sec = 1;