From: Ulf Hermann <ulf.hermann@qt.io>
Date: Thu, 20 Apr 2017 13:58:43 +0000 (+0200)
Subject: Use F_GETFD rather than F_GETFL to check validity of file descriptor
X-Git-Tag: elfutils-0.169~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fd9e7345b41eb2d6c11e0b8679e19df68e20171e;p=thirdparty%2Felfutils.git

Use F_GETFD rather than F_GETFL to check validity of file descriptor

F_GETFD is both cheaper and easier to port, and otherwise has the same
effect here.

Signed-off-by: Ulf Hermann <ulf.hermann@qt.io>
---

diff --git a/libelf/ChangeLog b/libelf/ChangeLog
index dd82a4331..3772c6d17 100644
--- a/libelf/ChangeLog
+++ b/libelf/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-20  Ulf Hermann  <ulf.hermann@qt.io>
+
+	* elf_begin.c: Use F_GETFD rather than F_GETFL.
+
 2017-04-20  Ulf Hermann  <ulf.hermann@qt.io>
 
 	* libelf.h: Define macros for various function attributes and use
diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c
index 5e9099c27..6f8503825 100644
--- a/libelf/elf_begin.c
+++ b/libelf/elf_begin.c
@@ -1075,7 +1075,7 @@ elf_begin (int fildes, Elf_Cmd cmd, Elf *ref)
   if (ref != NULL)
     /* Make sure the descriptor is not suddenly going away.  */
     rwlock_rdlock (ref->lock);
-  else if (unlikely (fcntl (fildes, F_GETFL) == -1 && errno == EBADF))
+  else if (unlikely (fcntl (fildes, F_GETFD) == -1 && errno == EBADF))
     {
       /* We cannot do anything productive without a file descriptor.  */
       __libelf_seterrno (ELF_E_INVALID_FILE);