aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2005-06-08 03:51:32 +0000
committerAlan Modra <amodra@gmail.com>2005-06-08 03:51:32 +0000
commitd83747fa84e7bea0475a0c7fcf000c3f91f83b61 (patch)
tree5435ec3b52844e5caa03aced10dc7b74fba5cc67
parent92a7c1b8ba9db048564ed12b55d2e9ef78e7e53b (diff)
downloadfsf-binutils-gdb-d83747fa84e7bea0475a0c7fcf000c3f91f83b61.zip
fsf-binutils-gdb-d83747fa84e7bea0475a0c7fcf000c3f91f83b61.tar.gz
fsf-binutils-gdb-d83747fa84e7bea0475a0c7fcf000c3f91f83b61.tar.bz2
* opncls.c (bfd_fdopenr): Don't set bfd_error unconditionally.
-rw-r--r--bfd/ChangeLog1
-rw-r--r--bfd/opncls.c6
2 files changed, 5 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6b8388f..58f3b91 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,7 @@
2005-06-08 Alan Modra <amodra@bigpond.net.au>
* opncls.c (bfd_fopen): Don't set bfd_error unconditionally.
+ (bfd_fdopenr): Same.
2005-06-07 Mark Mitchell <mark@codesourcery.com>
diff --git a/bfd/opncls.c b/bfd/opncls.c
index 112401a..df2cf6d 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -268,13 +268,15 @@ bfd_fdopenr (const char *filename, const char *target, int fd)
int fdflags;
#endif
- bfd_set_error (bfd_error_system_call);
#if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
mode = FOPEN_RUB; /* Assume full access. */
#else
fdflags = fcntl (fd, F_GETFL, NULL);
if (fdflags == -1)
- return NULL;
+ {
+ bfd_set_error (bfd_error_system_call);
+ return NULL;
+ }
/* (O_ACCMODE) parens are to avoid Ultrix header file bug. */
switch (fdflags & (O_ACCMODE))