diff options
| author | Phil Sutter <phil@nwl.cc> | 2017-08-24 11:51:48 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen@networkplumber.org> | 2017-08-24 14:53:14 -0700 |
| commit | bc27878d21909b110dd21eea0c3505d023f29dc2 (patch) | |
| tree | 894a4d84596bbea5d3f959598396d2f327b555f3 | |
| parent | cfda500a7d808a6e0f3eca47abd75c22cfe716e5 (diff) | |
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>
| -rw-r--r-- | misc/lnstat_util.c | 7 |
1 files changed, 2 insertions, 5 deletions
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; |