From 01eaee9309c09ca5d7dc6ef3b2e96084affdab30 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 21 Apr 2008 02:21:45 +0000 Subject: *: 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 --- networking/vconfig.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'networking/vconfig.c') diff --git a/networking/vconfig.c b/networking/vconfig.c index 7b6c2fa04..3f12e7609 100644 --- a/networking/vconfig.c +++ b/networking/vconfig.c @@ -133,10 +133,7 @@ int vconfig_main(int argc, char **argv) if (ifr.cmd == SET_VLAN_NAME_TYPE_CMD) { /* set_name_type */ ifr.u.name_type = *xfind_str(name_types+1, argv[1]); } else { - if (strlen(argv[1]) >= IF_NAMESIZE) { - bb_error_msg_and_die("if_name >= %d chars", IF_NAMESIZE); - } - strcpy(ifr.device1, argv[1]); + strncpy(ifr.device1, argv[1], IFNAMSIZ); p = argv[2]; /* I suppose one could try to combine some of the function calls below, -- cgit v1.2.3