瀏覽代碼

bind: use strchr() instead of index()

Peter Korsgaard 17 年之前
父節點
當前提交
4baf71840f
共有 1 個文件被更改,包括 33 次插入0 次删除
  1. 33 0
      package/bind/bind-9.3.2-susv3-legacy.patch

+ 33 - 0
package/bind/bind-9.3.2-susv3-legacy.patch

@@ -0,0 +1,33 @@
+---
+ lib/isc/unix/ifiter_ioctl.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+Index: bind-9.3.2/lib/isc/unix/ifiter_ioctl.c
+===================================================================
+--- bind-9.3.2.orig/lib/isc/unix/ifiter_ioctl.c
++++ bind-9.3.2/lib/isc/unix/ifiter_ioctl.c
+@@ -17,11 +17,12 @@
+ 
+ /* $Id: ifiter_ioctl.c,v 1.19.2.5.2.17 2005/10/14 02:13:07 marka Exp $ */
+ 
++#include <string.h>
++
+ /*
+  * Obtain the list of network interfaces using the SIOCGLIFCONF ioctl.
+  * See netintro(4).
+  */
+-
+ #if defined(SIOCGLIFCONF) && defined(SIOCGLIFADDR)
+ #ifdef ISC_PLATFORM_HAVEIF_LADDRCONF
+ #define lifc_len iflc_len
+@@ -478,8 +479,8 @@
+ 	for (i = 0; i < 16; i++) {
+ 		unsigned char byte;
+ 		static const char hex[] = "0123456789abcdef";
+-		byte = ((index(hex, address[i * 2]) - hex) << 4) |
+-		       (index(hex, address[i * 2 + 1]) - hex);
++		byte = ((strchr(hex, address[i * 2]) - hex) << 4) |
++		       (strchr(hex, address[i * 2 + 1]) - hex);
+ 		addr6.s6_addr[i] = byte;
+ 	}
+ 	iter->current.af = AF_INET6;