projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build breakage from last commit (window-nat.c:windows_create_inferior)
[deliverable/binutils-gdb.git]
/
bfd
/
bfdio.c
diff --git
a/bfd/bfdio.c
b/bfd/bfdio.c
index a80cd4f47db4f8452041f4b6a53a43f18d7c3a4c..792ccdab923a98328f08e41a588190136213502c 100644
(file)
--- a/
bfd/bfdio.c
+++ b/
bfd/bfdio.c
@@
-1,8
+1,6
@@
/* Low-level I/O routines for BFDs.
/* Low-level I/O routines for BFDs.
- Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
- 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 1990-2017 Free Software Foundation, Inc.
Written by Cygnus Support.
Written by Cygnus Support.
@@
-43,7
+41,7
@@
#endif
file_ptr
#endif
file_ptr
-real_ftell (FILE *file)
+
_bfd_
real_ftell (FILE *file)
{
#if defined (HAVE_FTELLO64)
return ftello64 (file);
{
#if defined (HAVE_FTELLO64)
return ftello64 (file);
@@
-55,7
+53,7
@@
real_ftell (FILE *file)
}
int
}
int
-real_fseek (FILE *file, file_ptr offset, int whence)
+
_bfd_
real_fseek (FILE *file, file_ptr offset, int whence)
{
#if defined (HAVE_FSEEKO64)
return fseeko64 (file, offset, whence);
{
#if defined (HAVE_FSEEKO64)
return fseeko64 (file, offset, whence);
@@
-84,12
+82,12
@@
close_on_exec (FILE *file)
}
FILE *
}
FILE *
-real_fopen (const char *filename, const char *modes)
+
_bfd_
real_fopen (const char *filename, const char *modes)
{
#ifdef VMS
char *vms_attr;
{
#ifdef VMS
char *vms_attr;
- /* On VMS, fopen allows file attributes as option
n
al arguments.
+ /* On VMS, fopen allows file attributes as optional arguments.
We need to use them but we'd better to use the common prototype.
In fopen-vms.h, they are separated from the mode with a comma.
Split here. */
We need to use them but we'd better to use the common prototype.
In fopen-vms.h, they are separated from the mode with a comma.
Split here. */
@@
-154,7
+152,7
@@
DESCRIPTION
. {* For the following, on successful completion a value of 0 is returned.
. Otherwise, a value of -1 is returned (and <<bfd_error>> is set). *}
. int (*bseek) (struct bfd *abfd, file_ptr offset, int whence);
. {* For the following, on successful completion a value of 0 is returned.
. Otherwise, a value of -1 is returned (and <<bfd_error>> is set). *}
. int (*bseek) (struct bfd *abfd, file_ptr offset, int whence);
-.
bfd_boolean
(*bclose) (struct bfd *abfd);
+.
int
(*bclose) (struct bfd *abfd);
. int (*bflush) (struct bfd *abfd);
. int (*bstat) (struct bfd *abfd, struct stat *sb);
. {* Mmap a part of the files. ADDR, LEN, PROT, FLAGS and OFFSET are the usual
. int (*bflush) (struct bfd *abfd);
. int (*bstat) (struct bfd *abfd, struct stat *sb);
. {* Mmap a part of the files. ADDR, LEN, PROT, FLAGS and OFFSET are the usual
@@
-236,7
+234,8
@@
bfd_tell (bfd *abfd)
bfd *parent_bfd = abfd;
ptr = abfd->iovec->btell (abfd);
bfd *parent_bfd = abfd;
ptr = abfd->iovec->btell (abfd);
- while (parent_bfd->my_archive != NULL)
+ while (parent_bfd->my_archive != NULL
+ && !bfd_is_thin_archive (parent_bfd->my_archive))
{
ptr -= parent_bfd->origin;
parent_bfd = parent_bfd->my_archive;
{
ptr -= parent_bfd->origin;
parent_bfd = parent_bfd->my_archive;
@@
-291,7
+290,7
@@
bfd_seek (bfd *abfd, file_ptr position, int direction)
if (direction == SEEK_CUR && position == 0)
return 0;
if (direction == SEEK_CUR && position == 0)
return 0;
- if (abfd->
format != bfd_archive && abfd->my_archive == 0
)
+ if (abfd->
my_archive == NULL || bfd_is_thin_archive (abfd->my_archive)
)
{
if (direction == SEEK_SET && (bfd_vma) position == abfd->where)
return 0;
{
if (direction == SEEK_SET && (bfd_vma) position == abfd->where)
return 0;
@@
-316,7
+315,8
@@
bfd_seek (bfd *abfd, file_ptr position, int direction)
{
bfd *parent_bfd = abfd;
{
bfd *parent_bfd = abfd;
- while (parent_bfd->my_archive != NULL)
+ while (parent_bfd->my_archive != NULL
+ && !bfd_is_thin_archive (parent_bfd->my_archive))
{
file_position += parent_bfd->origin;
parent_bfd = parent_bfd->my_archive;
{
file_position += parent_bfd->origin;
parent_bfd = parent_bfd->my_archive;
@@
-576,7
+576,7
@@
memory_bseek (bfd *abfd, file_ptr position, int direction)
return 0;
}
return 0;
}
-static
bfd_boolean
+static
int
memory_bclose (struct bfd *abfd)
{
struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
memory_bclose (struct bfd *abfd)
{
struct bfd_in_memory *bim = (struct bfd_in_memory *) abfd->iostream;
@@
-586,7
+586,7
@@
memory_bclose (struct bfd *abfd)
free (bim);
abfd->iostream = NULL;
free (bim);
abfd->iostream = NULL;
- return
TRUE
;
+ return
0
;
}
static int
}
static int
This page took
0.024956 seconds
and
4
git commands to generate.