Correct previous fix to ar, so that it now only comaplains about a lack of input...

	PR 21433
	* ar.c (main): Skip check for no files on the command line when
	running in MRI mode.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 206e4b745401132cd0c8f663e57f5bcf66253797..c442fde6be8a337c38dc5808e09f1982aa48971b 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-17  Nick Clifton  <nickc@redhat.com>
+
+       PR 21433
+       * ar.c (main): Skip check for no files on the command line when
+       running in MRI mode.
+
 2017-07-12  Nick Clifton  <nickc@redhat.com>
 
        Fix compile time warnings using gcc 7.1.1.

diff --git a/binutils/ar.c b/binutils/ar.c
index ef8b5bdb12bede18c47f65e2615b9e0ade8f9a56..25f3b3d0bf0318af1279314a2a40c5b840a96bf0 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -738,9 +738,6 @@ main (int argc, char **argv)
 
   arg_index = 0;
 
-  if (argv[arg_index] == NULL)
-    usage (0);
-
   if (mri_mode)
     {
       default_deterministic ();
@@ -750,6 +747,12 @@ main (int argc, char **argv)
     {
       bfd *arch;
 
+      /* Fail if no files are specified on the command line.
+        (But not for MRI mode which allows for reading arguments
+        and filenames from stdin).  */
+      if (argv[arg_index] == NULL)
+       usage (0);
+
       /* We don't use do_quick_append any more.  Too many systems
         expect ar to always rebuild the symbol table even when q is
         used.  */