AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 23:30:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

(if_indextoname): Correct error value for unknown interface.

Browse Source
This commit is contained in:
Ulrich Drepper 2004-06-17 23:06:41 +00:00
parent 5b2892d54e
commit c7be5c15e2
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sysdeps/unix/sysv/linux/if_index.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1997,98,99,2000,2002,2003 Free Software Foundation, Inc. /* Copyright (C) 1997,98,99,2000,2002,2003,2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -211,18 +211,26 @@ if_indextoname (unsigned int ifindex, char *ifname)
close_not_cancel_no_status (fd); close_not_cancel_no_status (fd);
# if __ASSUME_SIOCGIFNAME == 0
if (status < 0) if (status < 0)
{ {
# if __ASSUME_SIOCGIFNAME == 0
if (errno == EINVAL) if (errno == EINVAL)
siocgifname_works_not = 1; /* Don't make the same mistake twice. */ siocgifname_works_not = 1; /* Don't make the same mistake twice. */
else
# endif
{
if (errno == ENODEV)
/* POSIX requires ENXIO. */
__set_errno (ENXIO);
return NULL;
}
} }
else else
return strncpy (ifname, ifr.ifr_name, IFNAMSIZ); return strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
# if __ASSUME_SIOCGIFNAME == 0
__set_errno (serrno); __set_errno (serrno);
# else
return status < 0 ? NULL : strncpy (ifname, ifr.ifr_name, IFNAMSIZ);
# endif # endif
} }
# endif # endif
@ -240,6 +248,9 @@ if_indextoname (unsigned int ifindex, char *ifname)
} }
if_freenameindex (idx); if_freenameindex (idx);
if (result == NULL)
__set_errno (ENXIO);
} }
return result; return result;
# endif # endif