OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*** empty log message ***

This commit is contained in:
Steve Chamberlain 1991-04-04 17:55:47 +00:00
parent f61d204a35
commit b6fc45ca4c
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bfd/archive.c
View File

@ -28,7 +28,10 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
/* $Id$ /* $Id$
* $Log$ * $Log$
* Revision 1.3 1991/04/04 14:56:42 gumby * Revision 1.4 1991/04/04 17:55:47 steve
* *** empty log message ***
*
* Revision 1.3 1991/04/04 14:56:42 gumby
* Minor format fixes. * Minor format fixes.
* *
* Revision 1.2 1991/04/03 22:09:43 steve * Revision 1.2 1991/04/03 22:09:43 steve
@ -499,9 +502,11 @@ bfd_slurp_coff_armap (abfd)
carsym *carsyms; carsym *carsyms;
if (bfd_read ((void *)&nextname, 1, 1, abfd) != 1) { if (bfd_read ((void *)&nextname, 1, 1, abfd) != 1) {
bfd_seek (abfd, -1L, SEEK_CUR);
bfd_has_map(abfd) = false; bfd_has_map(abfd) = false;
return true; return true;
} }
bfd_seek (abfd, -1L, SEEK_CUR);
if (nextname != '/') { if (nextname != '/') {
/* Actually I think this is an error for a COFF archive */ /* Actually I think this is an error for a COFF archive */
@ -509,7 +514,6 @@ bfd_slurp_coff_armap (abfd)
return true; return true;
} }
bfd_seek (abfd, -1L, SEEK_CUR);
mapdata = snarf_ar_hdr (abfd); mapdata = snarf_ar_hdr (abfd);
if (mapdata == NULL) return false; if (mapdata == NULL) return false;
@ -683,11 +687,14 @@ bfd_construct_extended_name_table (abfd, tabloc, tablen)
char *normal =normalize( current->filename); char *normal =normalize( current->filename);
unsigned int thislen = strlen (normal); unsigned int thislen = strlen (normal);
if (thislen > maxname) { if (thislen > maxname) {
/* Works for now; may need to be re-engineered if we encounter an oddball
archive format and want to generalise this hack. */
struct ar_hdr *hdr = arch_hdr(current);
strcpy (strptr, normal); strcpy (strptr, normal);
current->filename[0] = ' '; hdr->ar_name[0] = ' ';
/* We know there will always be enough room (one of the few cases /* We know there will always be enough room (one of the few cases
where you may safely use sprintf). */ where you may safely use sprintf). */
sprintf ((current->filename) + 1, "-%o", (unsigned) (strptr - *tabloc)); sprintf ((hdr->ar_name) + 1, "%-o", (unsigned) (strptr - *tabloc));
strptr += thislen + 1; strptr += thislen + 1;
} }

2
bfd/coff-i960.c
View File

@ -231,7 +231,7 @@ bfd_target icoff_little_vec =
bfd_slurp_coff_armap, /* bfd_slurp_armap */ bfd_slurp_coff_armap, /* bfd_slurp_armap */
_bfd_slurp_extended_name_table, /* bfd_slurp_extended_name_table*/ _bfd_slurp_extended_name_table, /* bfd_slurp_extended_name_table*/
#if 0 /* */ #if 1 /* */
bfd_dont_truncate_arname, /* bfd_truncate_arname */ bfd_dont_truncate_arname, /* bfd_truncate_arname */
#else #else
bfd_bsd_truncate_arname, bfd_bsd_truncate_arname,

2
binutils/copy.c
View File

@ -148,7 +148,7 @@ bfd *obfd;
bfd *this_element; bfd *this_element;
/* Read each archive element in turn from the input, copy the /* Read each archive element in turn from the input, copy the
contents to a temp file, and keep the temp file handle */ contents to a temp file, and keep the temp file handle */
char *dir = cat("./",make_tempname(this_element->filename),"copy-dir"); char *dir = cat("./",make_tempname(""),"copy-dir");
/* Make a temp directory to hold the contents */ /* Make a temp directory to hold the contents */
mkdir(dir,0777); mkdir(dir,0777);