diff options
| author | Daniel Sabogal <dsabogalcc@gmail.com> | 2016-09-15 11:27:30 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-09-16 18:03:06 -0400 |
| commit | 32055d52ca43d867d6dbb763dc5213a8d3536a23 (patch) | |
| tree | c9a193f066851b22442d87a037926fbcd838d57e | |
| parent | 3848a99f65952a77c03bbd905cae988f37f13ea6 (diff) | |
| download | musl-32055d52ca43d867d6dbb763dc5213a8d3536a23.tar.gz | |
fix if_indextoname error case
posix requires errno to be set to ENXIO if the interface does not exist.
linux returns ENODEV instead so we handle this.
| -rw-r--r-- | src/network/if_indextoname.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/if_indextoname.c b/src/network/if_indextoname.c index 6ee7f13c..3b368bf0 100644 --- a/src/network/if_indextoname.c +++ b/src/network/if_indextoname.c @@ -3,6 +3,7 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <string.h> +#include <errno.h> #include "syscall.h" char *if_indextoname(unsigned index, char *name) @@ -14,5 +15,9 @@ char *if_indextoname(unsigned index, char *name) ifr.ifr_ifindex = index; r = ioctl(fd, SIOCGIFNAME, &ifr); __syscall(SYS_close, fd); - return r < 0 ? 0 : strncpy(name, ifr.ifr_name, IF_NAMESIZE); + if (r < 0) { + if (errno == ENODEV) errno = ENXIO; + return 0; + } + return strncpy(name, ifr.ifr_name, IF_NAMESIZE); } |