svn commit: trunk/busybox/networking

[Bernhard Fischer]

On Sun, Apr 20, 2008 at 07:21:46PM -0700, vda at busybox.net wrote:
>Author: vda
>Date: 2008-04-20 19:21:45 -0700 (Sun, 20 Apr 2008)
>New Revision: 21786
>
>Log:
>*: s/IF_NAMESIZE/IFNAMSIZ/, regularize its use a bit.
>
>function                                             old     new   delta
>strncpy_IFNAMSIZ                                       -      13     +13
>set_slave_mtu                                         39      37      -2
>set_slave_hwaddr                                      52      50      -2
>set_master_hwaddr                                     52      50      -2
>set_if_flags                                          40      38      -2
>get_if_settings                                      101      98      -3
>ifenslave_main                                      1680    1661     -19
>vconfig_main                                         306     280     -26
>------------------------------------------------------------------------------
>(add/remove: 1/0 grow/shrink: 0/7 up/down: 13/-56)            Total: -43 bytes
>
>
>
>Modified:
>   trunk/busybox/networking/Config.in
>   trunk/busybox/networking/brctl.c
>   trunk/busybox/networking/ifconfig.c
>   trunk/busybox/networking/ifenslave.c
>   trunk/busybox/networking/interface.c
>   trunk/busybox/networking/nameif.c
>   trunk/busybox/networking/vconfig.c
>
>
>Modified: trunk/busybox/networking/brctl.c
>===================================================================
>--- trunk/busybox/networking/brctl.c	2008-04-20 14:45:43 UTC (rev 21785)
>+++ trunk/busybox/networking/brctl.c	2008-04-21 02:21:45 UTC (rev 21786)
>@@ -137,7 +137,7 @@
> 
> 				if (!if_indextoname(bridx[i], brname))
> 					bb_perror_msg_and_die("can't get bridge name for index %d", i);
>-				safe_strncpy(ifr.ifr_name, brname, IFNAMSIZ);
>+				strncpy(ifr.ifr_name, brname, IFNAMSIZ);
> 
> 				arm_ioctl(args, BRCTL_GET_BRIDGE_INFO,
> 							(unsigned long) &bi, 0);
>@@ -191,7 +191,7 @@
> 		if (!*argv) /* all but 'addif/delif' need at least two arguments */
> 			bb_show_usage();
> 
>-		safe_strncpy(ifr.ifr_name, br, IFNAMSIZ);
>+		strncpy(ifr.ifr_name, br, IFNAMSIZ);
> 		if (key == ARG_addif || key == ARG_delif) { /* addif or delif */
> 			brif = *argv;
> 			ifr.ifr_ifindex = if_nametoindex(brif);
>
>Modified: trunk/busybox/networking/ifconfig.c
>===================================================================
>--- trunk/busybox/networking/ifconfig.c	2008-04-20 14:45:43 UTC (rev 21785)
>+++ trunk/busybox/networking/ifconfig.c	2008-04-21 02:21:45 UTC (rev 21786)
>@@ -315,7 +315,7 @@
> 	sockfd = xsocket(AF_INET, SOCK_DGRAM, 0);
> 
> 	/* get interface name */
>-	safe_strncpy(ifr.ifr_name, *argv, IFNAMSIZ);
>+	strncpy(ifr.ifr_name, *argv, IFNAMSIZ);

vda,
So you leave me curious why you use strncpy_IFNAMSIZ only partially,
i.e. not above?