Mercurial > hg > toybox

diff toys/pending/dhcpd.c @ 1640:41efba077b75 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Switch a lot of strncpy() calls to xstrncpy().
author Rob Landley <rob@landley.net>
date Thu, 01 Jan 2015 16:59:35 -0600
parents f2cac60ab2d3
children
line wrap: on
line diff
--- a/toys/pending/dhcpd.c	Thu Jan 01 16:49:55 2015 -0600
+++ b/toys/pending/dhcpd.c	Thu Jan 01 16:59:35 2015 -0600
@@ -246,8 +246,7 @@
   int fd = xsocket(AF_INET, SOCK_RAW, IPPROTO_RAW);
 
   req.ifr_addr.sa_family = AF_INET;
-  strncpy(req.ifr_name, interface, IFNAMSIZ);
-  req.ifr_name[IFNAMSIZ-1] = '\0';
+  xstrncpy(req.ifr_name, interface, IFNAMSIZ);
 
   xioctl(fd, SIOCGIFFLAGS, &req);
   
@@ -625,8 +624,7 @@
       return -1;
   }
   memset(&ifr, 0, sizeof(ifr));
-  strncpy(ifr.ifr_name, gconfig.interface, IFNAMSIZ);
-  ifr.ifr_name[IFNAMSIZ -1] = '\0';
+  xstrncpy(ifr.ifr_name, gconfig.interface, IFNAMSIZ);
   setsockopt(gstate.listensock, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
 
   memset(&addr, 0, sizeof(addr));