lib, zebra: remove uses of strncpy

This removes the last removable uses of strncpy in FRR.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/command_match.c b/lib/command_match.c
index 8b34d1e3eb907e6848e75ea6af5edbe23d16c61a..9456e1585a9ece96b6dce18447efd5a5ce155e29 100644 (file)
--- a/lib/command_match.c
+++ b/lib/command_match.c
@@ -723,7 +723,7 @@ static enum match_type match_ipv4(const char *str)
                if (str - sp > 3)
                        return no_match;
 
-               strncpy(buf, sp, str - sp);
+               memcpy(buf, sp, str - sp);
                if (atoi(buf) > 255)
                        return no_match;
 
@@ -774,7 +774,7 @@ static enum match_type match_ipv4_prefix(const char *str)
                if (str - sp > 3)
                        return no_match;
 
-               strncpy(buf, sp, str - sp);
+               memcpy(buf, sp, str - sp);
                if (atoi(buf) > 255)
                        return no_match;
 

diff --git a/lib/vty.c b/lib/vty.c
index 91ba0a43c80594154bc20955797b8feb24a61105..9bee7b6c8317c86d88b2ec3b0fd26a3635f67ae9 100644 (file)
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -998,7 +998,7 @@ static void vty_describe_fold(struct vty *vty, int cmd_width,
                if (pos == 0)
                        break;
 
-               strncpy(buf, p, pos);
+               memcpy(buf, p, pos);
                buf[pos] = '\0';
                vty_out(vty, "  %-*s  %s\n", cmd_width, cmd, buf);
 

diff --git a/zebra/ioctl.c b/zebra/ioctl.c
index 322527015bd5b440503fe0d68f69da2b69bfde89..8202e076afb49cf387408d95d38b12f077b3036b 100644 (file)
--- a/zebra/ioctl.c
+++ b/zebra/ioctl.c
@@ -245,7 +245,7 @@ static int if_set_prefix_ctx(const struct zebra_dplane_ctx *ctx)
        p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
 
        memset(&addreq, 0, sizeof(addreq));
-       strncpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
+       strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
                sizeof(addreq.ifra_name));
 
        memset(&addr, 0, sizeof(struct sockaddr_in));
@@ -296,7 +296,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
        p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
 
        memset(&addreq, 0, sizeof(addreq));
-       strncpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
+       strlcpy((char *)&addreq.ifra_name, dplane_ctx_get_ifname(ctx),
                sizeof(addreq.ifra_name));
 
        memset(&addr, 0, sizeof(struct sockaddr_in));

diff --git a/zebra/ioctl_solaris.c b/zebra/ioctl_solaris.c
index ccfa7a4a4c38f3111b9eb5f6fbf27aa0e1170986..1f96fa23ea3af4b2c1368c1171ecaa3b33f94395 100644 (file)
--- a/zebra/ioctl_solaris.c
+++ b/zebra/ioctl_solaris.c
@@ -286,7 +286,7 @@ static int if_unset_prefix_ctx(const struct zebra_dplane_ctx *ctx)
 
        p = (struct prefix_ipv4 *)dplane_ctx_get_intf_addr(ctx);
 
-       strncpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx),
+       strlcpy(ifreq.ifr_name, dplane_ctx_get_ifname(ctx),
                sizeof(ifreq.ifr_name));
 
        memset(&addr, 0, sizeof(struct sockaddr_in));