libbb: add strncpy_IFNAMSIZ
function old new delta ... udhcp_read_interface 225 220 -5 brctl_main 1151 1146 -5 add_interface 109 104 -5 ipaddr_list_or_flush 2174 2167 -7 do_add_ioctl 88 80 -8 vconfig_main 249 240 -9 do_del_ioctl 78 68 -10 do_iplink 1186 1173 -13 do_if_fetch 766 753 -13 buffer_fill_and_print 196 179 -17 parse_args 1709 1684 -25 ------------------------------------------------------------------------------ (add/remove: 0/0 grow/shrink: 2/20 up/down: 11/-140) Total: -129 bytes
This commit is contained in:
@@ -41,7 +41,7 @@ static void do_chflags(char *dev, uint32_t flags, uint32_t mask)
|
||||
struct ifreq ifr;
|
||||
int fd;
|
||||
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy_IFNAMSIZ(ifr.ifr_name, dev);
|
||||
fd = get_ctl_fd();
|
||||
xioctl(fd, SIOCGIFFLAGS, &ifr);
|
||||
if ((ifr.ifr_flags ^ flags) & mask) {
|
||||
@@ -58,8 +58,8 @@ static void do_changename(char *dev, char *newdev)
|
||||
struct ifreq ifr;
|
||||
int fd;
|
||||
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy(ifr.ifr_newname, newdev, sizeof(ifr.ifr_newname));
|
||||
strncpy_IFNAMSIZ(ifr.ifr_name, dev);
|
||||
strncpy_IFNAMSIZ(ifr.ifr_newname, newdev);
|
||||
fd = get_ctl_fd();
|
||||
xioctl(fd, SIOCSIFNAME, &ifr);
|
||||
close(fd);
|
||||
@@ -73,7 +73,7 @@ static void set_qlen(char *dev, int qlen)
|
||||
|
||||
s = get_ctl_fd();
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy_IFNAMSIZ(ifr.ifr_name, dev);
|
||||
ifr.ifr_qlen = qlen;
|
||||
xioctl(s, SIOCSIFTXQLEN, &ifr);
|
||||
close(s);
|
||||
@@ -87,7 +87,7 @@ static void set_mtu(char *dev, int mtu)
|
||||
|
||||
s = get_ctl_fd();
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy_IFNAMSIZ(ifr.ifr_name, dev);
|
||||
ifr.ifr_mtu = mtu;
|
||||
xioctl(s, SIOCSIFMTU, &ifr);
|
||||
close(s);
|
||||
@@ -104,7 +104,7 @@ static int get_address(char *dev, int *htype)
|
||||
s = xsocket(PF_PACKET, SOCK_DGRAM, 0);
|
||||
|
||||
memset(&ifr, 0, sizeof(ifr));
|
||||
strncpy(ifr.ifr_name, dev, sizeof(ifr.ifr_name));
|
||||
strncpy_IFNAMSIZ(ifr.ifr_name, dev);
|
||||
xioctl(s, SIOCGIFINDEX, &ifr);
|
||||
|
||||
memset(&me, 0, sizeof(me));
|
||||
@@ -128,7 +128,7 @@ static void parse_address(char *dev, int hatype, int halen, char *lla, struct if
|
||||
int alen;
|
||||
|
||||
memset(ifr, 0, sizeof(*ifr));
|
||||
strncpy(ifr->ifr_name, dev, sizeof(ifr->ifr_name));
|
||||
strncpy_IFNAMSIZ(ifr->ifr_name, dev);
|
||||
ifr->ifr_hwaddr.sa_family = hatype;
|
||||
|
||||
alen = hatype == 1/*ARPHRD_ETHER*/ ? 14/*ETH_HLEN*/ : 19/*INFINIBAND_HLEN*/;
|
||||
|
Reference in New Issue
Block a user