Commit: 931004e4578333db0429abc7219282dbc0e10076 - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• Revision: 931004e4578333db0429abc7219282dbc0e10076 (tree)
• Zeit: 1991-04-20 03:04:37
• Autor: David Henkel-Wallace <gumby@cygn...>
• Commiter: David Henkel-Wallace

Log Message

allow the user to specify a file more than once on the command line --
the duplicate references are ignored.
::wq

Ändern Zusammenfassung

• modified: binutils/ar.c

Diff

--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -511,7 +511,6 @@ extract_file(abfd)
 		exit(1);
 	    }
 	}
-	/* no need to byte-swap; the two formats are presumably compatible(!) */
 	fwrite(cbuf, 1, nread, ostream);
 	ncopied += tocopy;
     }
@@ -845,6 +844,14 @@ replace_members(files_to_move)
 		if (newer_only) {
 		    struct stat     fsbuf,
 		                    asbuf;
+
+		    if (current->arelt_data == NULL) {
+		      /* This can only happen if you specify a file on the
+			 command line more than once. */
+		      fprintf (stderr, "Duplicate file specified: %s -- skipping.\n", *files_to_move);
+		      goto next_file;
+		    }
+
 		    if (stat(*files_to_move, &fsbuf) != 0) {
 			if (errno != ENOENT)
 			    bfd_fatal(*files_to_move);