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

Rename truncate to ar_truncate

This commit is contained in:
Ian Lance Taylor 1995-07-04 20:38:00 +00:00
parent 52af6a44ad
commit cbd0453da4
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
binutils/ChangeLog
View File

@ -3,13 +3,13 @@ Tue Jul 4 14:48:42 1995 Ian Lance Taylor <ian@cygnus.com>
* ar.c (replace_members): In verbose messages, use 'r' when
replacing a member, and 'a' when adding one.
* ar.c (truncate): New static variable.
* ar.c (ar_truncate): New static variable.
(normalize): Change return type to const char *. Add abfd
argument. Change all callers. If truncate, chop the filename to
abfd->ar_max_namelen.
(main): For the 'f' modifier, set truncate to true. Don't change
quick_append to replace to truncate is true.
(do_quick_append): If truncate, set BFD_TRADITIONAL_FORMAT.
argument. Change all callers. If ar_truncate, chop the filename
to abfd->ar_max_namelen.
(main): For the 'f' modifier, set ar_truncate to true. Don't
change quick_append to replace if ar_truncate is true.
(do_quick_append): If ar_truncate, set BFD_TRADITIONAL_FORMAT.
(write_archive): Likewise.
* binutils.texi, ar.1: Document 'f' modifier.

12
binutils/ar.c
View File

@ -143,7 +143,7 @@ enum pos
} postype = pos_default;
/* Whether to truncate names of files stored in the archive. */
static boolean truncate = false;
static boolean ar_truncate = false;
int interactive = 0;
@ -250,7 +250,7 @@ normalize (file, abfd)
else
filename = file;
if (truncate
if (ar_truncate
&& abfd != NULL
&& strlen (filename) > abfd->xvec->ar_max_namelen)
{
@ -439,7 +439,7 @@ main (argc, argv)
mri_mode = 1;
break;
case 'f':
truncate = true;
ar_truncate = true;
break;
default:
fprintf (stderr, "%s: illegal option -- %c\n", program_name, c);
@ -493,7 +493,7 @@ main (argc, argv)
rebuild the name table. Unfortunately, at this point we
don't actually know the maximum name length permitted by this
object file format. So, we guess. FIXME. */
if (operation == quick_append && ! truncate)
if (operation == quick_append && ! ar_truncate)
{
char **chk;
@ -823,7 +823,7 @@ do_quick_append (archive_filename, files_to_append)
program_name, archive_filename);
}
if (truncate)
if (ar_truncate)
temp->flags |= BFD_TRADITIONAL_FORMAT;
/* assume it's an achive, go straight to the end, sans $200 */
@ -901,7 +901,7 @@ write_archive (iarch)
been explicitly requested not to. */
obfd->has_armap = write_armap >= 0;
if (truncate)
if (ar_truncate)
{
/* This should really use bfd_set_file_flags, but that rejects
archives. */