summaryrefslogtreecommitdiffstats
path: root/contrib/binutils/bfd/opncls.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/binutils/bfd/opncls.c')
-rw-r--r--contrib/binutils/bfd/opncls.c76
1 files changed, 34 insertions, 42 deletions
diff --git a/contrib/binutils/bfd/opncls.c b/contrib/binutils/bfd/opncls.c
index 200f6c7..cdf08df 100644
--- a/contrib/binutils/bfd/opncls.c
+++ b/contrib/binutils/bfd/opncls.c
@@ -5,21 +5,21 @@
Written by Cygnus Support.
-This file is part of BFD, the Binary File Descriptor library.
+ This file is part of BFD, the Binary File Descriptor library.
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include "bfd.h"
#include "sysdep.h"
@@ -39,9 +39,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
/* fdopen is a loser -- we should use stdio exclusively. Unfortunately
if we do that we can't use fcntl. */
-/* FIXME: This is no longer used. */
-long _bfd_chunksize = -1;
-
/* Return a new BFD. All BFD's are allocated through this routine. */
bfd *
@@ -155,7 +152,6 @@ bfd_openr (filename, target)
target_vec = bfd_find_target (target, nbfd);
if (target_vec == NULL)
{
- bfd_set_error (bfd_error_invalid_target);
_bfd_delete_bfd (nbfd);
return NULL;
}
@@ -165,7 +161,7 @@ bfd_openr (filename, target)
if (bfd_open_file (nbfd) == NULL)
{
- /* File didn't exist, or some such */
+ /* File didn't exist, or some such. */
bfd_set_error (bfd_error_system_call);
_bfd_delete_bfd (nbfd);
return NULL;
@@ -180,8 +176,7 @@ bfd_openr (filename, target)
won't cause a storage leak.
o - We open the file stream last, since we don't want to have to
close it if anything goes wrong. Closing the stream means closing
- the file descriptor too, even though we didn't open it.
- */
+ the file descriptor too, even though we didn't open it. */
/*
FUNCTION
bfd_fdopenr
@@ -220,11 +215,12 @@ bfd_fdopenr (filename, target, fd)
bfd_set_error (bfd_error_system_call);
#if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
- fdflags = O_RDWR; /* Assume full access */
+ fdflags = O_RDWR; /* Assume full access. */
#else
fdflags = fcntl (fd, F_GETFL, NULL);
#endif
- if (fdflags == -1) return NULL;
+ if (fdflags == -1)
+ return NULL;
nbfd = _bfd_new_bfd ();
if (nbfd == NULL)
@@ -233,7 +229,6 @@ bfd_fdopenr (filename, target, fd)
target_vec = bfd_find_target (target, nbfd);
if (target_vec == NULL)
{
- bfd_set_error (bfd_error_invalid_target);
_bfd_delete_bfd (nbfd);
return NULL;
}
@@ -241,7 +236,7 @@ bfd_fdopenr (filename, target, fd)
#ifndef HAVE_FDOPEN
nbfd->iostream = (PTR) fopen (filename, FOPEN_RB);
#else
- /* (O_ACCMODE) parens are to avoid Ultrix header file bug */
+ /* (O_ACCMODE) parens are to avoid Ultrix header file bug. */
switch (fdflags & (O_ACCMODE))
{
case O_RDONLY: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RB); break;
@@ -257,14 +252,13 @@ bfd_fdopenr (filename, target, fd)
return NULL;
}
- /* OK, put everything where it belongs */
-
+ /* OK, put everything where it belongs. */
nbfd->filename = filename;
/* As a special case we allow a FD open for read/write to
be written through, although doing so requires that we end
the previous clause with a preposition. */
- /* (O_ACCMODE) parens are to avoid Ultrix header file bug */
+ /* (O_ACCMODE) parens are to avoid Ultrix header file bug. */
switch (fdflags & (O_ACCMODE))
{
case O_RDONLY: nbfd->direction = read_direction; break;
@@ -313,7 +307,6 @@ bfd_openstreamr (filename, target, streamarg)
target_vec = bfd_find_target (target, nbfd);
if (target_vec == NULL)
{
- bfd_set_error (bfd_error_invalid_target);
_bfd_delete_bfd (nbfd);
return NULL;
}
@@ -331,10 +324,10 @@ bfd_openstreamr (filename, target, streamarg)
return nbfd;
}
-/** bfd_openw -- open for writing.
- Returns a pointer to a freshly-allocated BFD on success, or NULL.
+/* bfd_openw -- open for writing.
+ Returns a pointer to a freshly-allocated BFD on success, or NULL.
- See comment by bfd_fdopenr before you try to modify this function. */
+ See comment by bfd_fdopenr before you try to modify this function. */
/*
FUNCTION
@@ -359,11 +352,8 @@ bfd_openw (filename, target)
bfd *nbfd;
const bfd_target *target_vec;
- bfd_set_error (bfd_error_system_call);
-
/* nbfd has to point to head of malloc'ed block so that bfd_close may
- reclaim it correctly. */
-
+ reclaim it correctly. */
nbfd = _bfd_new_bfd ();
if (nbfd == NULL)
return NULL;
@@ -380,7 +370,8 @@ bfd_openw (filename, target)
if (bfd_open_file (nbfd) == NULL)
{
- bfd_set_error (bfd_error_system_call); /* File not writeable, etc */
+ /* File not writeable, etc. */
+ bfd_set_error (bfd_error_system_call);
_bfd_delete_bfd (nbfd);
return NULL;
}
@@ -419,7 +410,7 @@ bfd_close (abfd)
{
boolean ret;
- if (!bfd_read_p (abfd))
+ if (bfd_write_p (abfd))
{
if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
return false;
@@ -431,7 +422,7 @@ bfd_close (abfd)
ret = bfd_cache_close (abfd);
/* If the file was open for writing and is now executable,
- make it so */
+ make it so. */
if (ret
&& abfd->direction == write_direction
&& abfd->flags & EXEC_P)
@@ -441,6 +432,7 @@ bfd_close (abfd)
if (stat (abfd->filename, &buf) == 0)
{
unsigned int mask = umask (0);
+
umask (mask);
chmod (abfd->filename,
(0777
@@ -473,7 +465,6 @@ DESCRIPTION
RETURNS
<<true>> is returned if all is ok, otherwise <<false>>.
-
*/
boolean
@@ -485,7 +476,7 @@ bfd_close_all_done (abfd)
ret = bfd_cache_close (abfd);
/* If the file was open for writing and is now executable,
- make it so */
+ make it so. */
if (ret
&& abfd->direction == write_direction
&& abfd->flags & EXEC_P)
@@ -495,6 +486,7 @@ bfd_close_all_done (abfd)
if (stat (abfd->filename, &buf) == 0)
{
unsigned int mask = umask (0);
+
umask (mask);
chmod (abfd->filename,
(0777
@@ -519,7 +511,6 @@ DESCRIPTION
<<bfd_openw>>, but without opening a file. The new BFD
takes the target from the target used by @var{template}. The
format is always set to <<bfd_object>>.
-
*/
bfd *
@@ -537,6 +528,7 @@ bfd_create (filename, templ)
nbfd->xvec = templ->xvec;
nbfd->direction = no_direction;
bfd_set_format (nbfd, bfd_object);
+
return nbfd;
}
@@ -572,7 +564,7 @@ bfd_make_writable(abfd)
bim = ((struct bfd_in_memory *)
bfd_malloc ((bfd_size_type) sizeof (struct bfd_in_memory)));
abfd->iostream = (PTR) bim;
- /* bfd_bwrite will grow these as needed */
+ /* bfd_bwrite will grow these as needed. */
bim->size = 0;
bim->buffer = 0;
@@ -639,7 +631,7 @@ bfd_make_readable(abfd)
abfd->tdata.any = 0;
bfd_section_list_clear (abfd);
- bfd_check_format(abfd, bfd_object);
+ bfd_check_format (abfd, bfd_object);
return true;
}
OpenPOWER on IntegriCloud