X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fnetwork%2Fif_nameindex.c;h=ad0a76624bf85bb5500998b07868570b14948a4f;hb=87be54a135db6d9ad16fcffe72b05c8d23b0f089;hp=580acce07970bea433728a1d6de749ab767b616b;hpb=fc0ecd35d8e0041c81bbe08c10c7fcb946da85e0;p=musl

diff --git a/src/network/if_nameindex.c b/src/network/if_nameindex.c
index 580acce0..ad0a7662 100644
--- a/src/network/if_nameindex.c
+++ b/src/network/if_nameindex.c
@@ -10,7 +10,7 @@
 
 static void *do_nameindex(int s, size_t n)
 {
-	size_t i, len;
+	size_t i, len, k;
 	struct ifconf conf;
 	struct if_nameindex *idx;
 
@@ -29,17 +29,16 @@ static void *do_nameindex(int s, size_t n)
 	}
 
 	n = conf.ifc_len / sizeof(struct ifreq);
-	for (i=0; i<n; i++) {
+	for (i=k=0; i<n; i++) {
 		if (ioctl(s, SIOCGIFINDEX, &conf.ifc_req[i]) < 0) {
-			i--;
-			n--;
+			k++;
 			continue;
 		}
-		idx[i].if_index = conf.ifc_req[i].ifr_ifindex;
-		idx[i].if_name = conf.ifc_req[i].ifr_name;
+		idx[i-k].if_index = conf.ifc_req[i].ifr_ifindex;
+		idx[i-k].if_name = conf.ifc_req[i].ifr_name;
 	}
-	idx[i].if_name = 0;
-	idx[i].if_index = 0;
+	idx[i-k].if_name = 0;
+	idx[i-k].if_index = 0;
 
 	return idx;
 }
@@ -48,7 +47,7 @@ struct if_nameindex *if_nameindex()
 {
 	size_t n;
 	void *p = 0;
-	int s = socket(AF_UNIX, SOCK_DGRAM, 0);
+	int s = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
 	if (s>=0) {
 		for (n=0; (p=do_nameindex(s, n)) == (void *)-1; n++);
 		__syscall(SYS_close, s);