Produce a consistent warning message when attempting to run a tool on a directory.

	PR binutils/21659
	* bucomm.c (get_file_size): Explicitly warn if the file is a
	directory.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index cc4003cb4f5b2d7ef15569cfecad1cd4c2f2da55..6810c22154746d6cbe38711f5cb4a720bb0517b0 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-26  Nick Clifton  <nickc@redhat.com>
+
+       PR binutils/21659
+       * bucomm.c (get_file_size): Explicitly warn if the file is a
+       directory.
+
 2017-06-24  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        * readelf.c (arm_attr_tag_CPU_arch): Fill value for ARMv8-R.

diff --git a/binutils/bucomm.c b/binutils/bucomm.c
index fd6f35604d88d18a7bd5db5f37e4ab5f885c4cfb..5a0b634344c14f2a7e9394e3904a2f6a492f1b31 100644 (file)
--- a/binutils/bucomm.c
+++ b/binutils/bucomm.c
@@ -598,6 +598,8 @@ get_file_size (const char * file_name)
        non_fatal (_("Warning: could not locate '%s'.  reason: %s"),
                   file_name, strerror (errno));
     }
+  else if (S_ISDIR (statbuf.st_mode))
+    non_fatal (_("Warning: '%s' is a directory"), file_name);
   else if (! S_ISREG (statbuf.st_mode))
     non_fatal (_("Warning: '%s' is not an ordinary file"), file_name);
   else if (statbuf.st_size < 0)