Update to musl 1.2.2.

[wasi-libc.git] / libc-top-half / musl / src / network / lookup_name.c

diff --git a/libc-top-half/musl/src/network/lookup_name.c b/libc-top-half/musl/src/network/lookup_name.c
index aae0d95a041504b60cd1827278ba4ee1a3bee4c0..aa558c197abe813865ba28c1228be272bae62924 100644 (file)
--- a/libc-top-half/musl/src/network/lookup_name.c
+++ b/libc-top-half/musl/src/network/lookup_name.c
@@ -50,7 +50,7 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati
 {
        char line[512];
        size_t l = strlen(name);
-       int cnt = 0, badfam = 0;
+       int cnt = 0, badfam = 0, have_canon = 0;
        unsigned char _buf[1032];
        FILE _f, *f = __fopen_rb_ca("/etc/hosts", &_f, _buf, sizeof _buf);
        if (!f) switch (errno) {
@@ -80,14 +80,19 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati
                        continue;
                default:
                        badfam = EAI_NONAME;
-                       continue;
+                       break;
                }
 
+               if (have_canon) continue;
+
                /* Extract first name as canonical name */
                for (; *p && isspace(*p); p++);
                for (z=p; *z && !isspace(*z); z++);
                *z = 0;
-               if (is_valid_hostname(p)) memcpy(canon, p, z-p+1);
+               if (is_valid_hostname(p)) {
+                       have_canon = 1;
+                       memcpy(canon, p, z-p+1);
+               }
        }
        __fclose_ca(f);
        return cnt ? cnt : badfam;