matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

tools: remove strncpy() use

Browse source 
`checkpatch` has sufficiently annoyed me to fix this.

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
David Lamparter 2024-10-17 14:36:07 +02:00
parent 4606612abe
commit cf4fc9c484
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/start-stop-daemon.c
View file

@ -66,6 +66,12 @@
#include <linux/sched.h> #include <linux/sched.h>
#endif #endif
/* this is in zebra.h, but including that here isn't a good fit... */
#ifndef HAVE_STRLCPY
size_t strlcpy(char *__restrict dest,
const char *__restrict src, size_t destsize);
#endif
static int testmode = 0; static int testmode = 0;
static int quietmode = 0; static int quietmode = 0;
static int exitnodo = 1; static int exitnodo = 1;
@ -749,8 +755,7 @@ static void do_stop(int signal_nr, int quietmode, int *n_killed,
static void set_what_stop(const char *str) static void set_what_stop(const char *str)
{ {
strncpy(what_stop, str, sizeof(what_stop)); strlcpy(what_stop, str, sizeof(what_stop));
what_stop[sizeof(what_stop) - 1] = '\0';
} }
static int run_stop_schedule(void) static int run_stop_schedule(void)

2
tools/subdir.am
View file

@ -39,7 +39,7 @@ tools_gen_northbound_callbacks_LDADD = lib/libfrr.la $(LIBYANG_LIBS)
tools_gen_yang_deviations_SOURCES = tools/gen_yang_deviations.c tools_gen_yang_deviations_SOURCES = tools/gen_yang_deviations.c
tools_gen_yang_deviations_LDADD = lib/libfrr.la $(LIBYANG_LIBS) tools_gen_yang_deviations_LDADD = lib/libfrr.la $(LIBYANG_LIBS)
tools_ssd_SOURCES = tools/start-stop-daemon.c tools_ssd_SOURCES = tools/start-stop-daemon.c lib/strlcpy.c
tools_ssd_CPPFLAGS = tools_ssd_CPPFLAGS =
# don't bother autoconf'ing these for a simple optional tool # don't bother autoconf'ing these for a simple optional tool