* bfd.c (_bfd_default_error_handler): Account for doubled '%' in

	free space available.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 71597b60be820d7658daf5ced6e1035321535108..6d38dbb66ff7ea135de0b58b0e45b3a02e9ac297 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * bfd.c (_bfd_default_error_handler): Account for doubled '%' in
+       free space available.
+
 2004-08-16  Alan Modra  <amodra@bigpond.net.au>
 
        * pdp11.c (struct pdp11_aout_reloc_external): Delete.  Replace

diff --git a/bfd/bfd.c b/bfd/bfd.c
index b842027a66b53426a8be0528f564110912424f88..d888eb13337a944b3aa605852ffea4c42225b22b 100644 (file)
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
@@ -531,7 +531,9 @@ _bfd_default_error_handler (const char *fmt, ...)
                    }
                  while (--trim != 0);
                  *q = '\0';
+                 avail = extra;
                }
+             avail -= extra;
 
              /* Now double all '%' chars, shuffling the string as we go.  */
              while (extra != 0)