Merge from mainline.

4 files changed, 52 insertions, 39 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b23904a3575..939e11ed61c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -2,6 +2,19 @@
 
         * doprnt.c (doprnt): Support "ll" length modifier, for long long.
 
+2011-04-27  Eli Zaretskii  <eliz@gnu.org>
+
+        Improve `doprnt' and its usage.  (Bug#8545)
+        * doprnt.c (doprnt): Make sure `format' is never accessed beyond
+        `format_end'.  Remove support for %l as a conversion specifier.
+        Don't use xrealloc.  Improve diagnostics when the %l size modifier
+        is used.  Update the commentary.
+
+        * eval.c (verror): Simplify calculation of size_t.
+
+        * coding.c (Ffind_operation_coding_system): Fix diagnostic error
+        messages.
+
 2011-04-27  Yoshiaki Kasahara  <kasahara@nc.kyushu-u.ac.jp>  (tiny change)
 
         * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing
@@ -21,7 +34,7 @@
         Remove unused local.
         (emacs_gnutls_write): Don't use uninitialized rtnval if nbyte <= 0.
 
-        lisp.h: Fix a problem with aliasing and vector headers.  (Bug#8546)
+        * lisp.h: Fix a problem with aliasing and vector headers.  (Bug#8546)
         GCC 4.6.0 optimizes based on type-based alias analysis.  For
         example, if b is of type struct buffer * and v of type struct
         Lisp_Vector *, then gcc -O2 was incorrectly assuming that &b->size
@@ -213,7 +226,7 @@
         supposed to be handshaking.  (Bug#8556)
         Reported by Paul Eggert <eggert@cs.ucla.edu>.
 
-2011-04-26  Daniel Colascione <dan.colascione@gmail.com>
+2011-04-26  Daniel Colascione  <dan.colascione@gmail.com>
 
         * lisp.h (Qdebug): List symbol.
         * eval.c (Qdebug): Restore global linkage.
@@ -469,8 +482,8 @@
         define if USE_GTK || USE_X_TOOLKIT.
         (SET_SAVED_BUTTON_EVENT): Define only if USE_X_TOOLKIT || USE_GTK.
         * xterm.h (x_dispatch_event): Extern only if USE_X_TOOLKIT.
-        * xterm.c, xterm.h (x_mouse_leave): Bring this function back, but only if
-        defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK.
+        * xterm.c, xterm.h (x_mouse_leave): Bring this function back, but only
+        if defined HAVE_MENUS && !defined USE_X_TOOLKIT && !defined USE_GTK.
 
         * xmenu.c (menu_help_callback): Pointer type fixes.
         Use const pointers when pointing at readonly data.  Avoid pointer
diff --git a/src/coding.c b/src/coding.c
index c14a41036ac..c129c94203c 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -9282,14 +9282,15 @@ usage: (find-operation-coding-system OPERATION ARGUMENTS...)  */)
       || !NATNUMP (target_idx = Fget (operation, Qtarget_idx)))
     error ("Invalid first argument");
   if (nargs < 1 + XFASTINT (target_idx))
-    error ("Too few arguments for operation: %s",
+    error ("Too few arguments for operation `%s'",
            SDATA (SYMBOL_NAME (operation)));
   target = args[XFASTINT (target_idx) + 1];
   if (!(STRINGP (target)
         || (EQ (operation, Qinsert_file_contents) && CONSP (target)
             && STRINGP (XCAR (target)) && BUFFERP (XCDR (target)))
         || (EQ (operation, Qopen_network_stream) && INTEGERP (target))))
-    error ("Invalid %"pI"dth argument", XFASTINT (target_idx) + 1);
+    error ("Invalid argument %"pI"d of operation `%s'",
+           XFASTINT (target_idx) + 1, SDATA (SYMBOL_NAME (operation)));
   if (CONSP (target))
     target = XCAR (target);
 
diff --git a/src/doprnt.c b/src/doprnt.c
index 229ad06e057..cc4e5daebf3 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -55,7 +55,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    %s means print a string argument.
    %S is silently treated as %s, for loose compatibility with `Fformat'.
    %d means print a `signed int' argument in decimal.
-   %l means print a `long int' argument in decimal.
    %o means print an `unsigned int' argument in octal.
    %x means print an `unsigned int' argument in hex.
    %e means print a `double' argument in exponential notation.
@@ -65,24 +64,28 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    %c means print a `signed int' argument as a single character.
    %% means produce a literal % character.
 
-   A %-sequence may contain optional flag, width, and precision specifiers, as
-   follows:
+   A %-sequence may contain optional flag, width, and precision specifiers, and
+   a length modifier, as follows:
 
-     %<flags><width><precision>character
+     %<flags><width><precision><length>character
 
    where flags is [+ -0l], width is [0-9]+, and precision is .[0-9]+
 
    The + flag character inserts a + before any positive number, while a space
-   inserts a space before any positive number; these flags only affect %d, %l,
-   %o, %x, %e, %f, and %g sequences.  The - and 0 flags affect the width
-   specifier, as described below.
-
-   The l (lower-case letter ell) flag is a `long' data type modifier: it is
-   supported for %d, %o, and %x conversions of integral arguments, and means
-   that the respective argument is to be treated as `long int' or `unsigned
-   long int'.  ll means to use 'long long'.  EMACS_INT arguments
-   should use the pI macro, which expands to whatever length modifier
-   is needed for the target host, e.g., "", "l", "ll".
+   inserts a space before any positive number; these flags only affect %d, %o,
+   %x, %e, %f, and %g sequences.  The - and 0 flags affect the width specifier,
+   as described below.  For signed numerical arguments only, the ` ' (space)
+   flag causes the result to be prefixed with a space character if it does not
+   start with a sign (+ or -).
+
+   The l (lower-case letter ell) length modifier is a `long' data type
+   modifier: it is supported for %d, %o, and %x conversions of integral
+   arguments, must immediately precede the conversion specifier, and means that
+   the respective argument is to be treated as `long int' or `unsigned long
+   int'.  Similarly, ll (two letter ells) means to use `long long int' or
+   `unsigned long long int'.  The empty length modifier means to use `int' or
+   `unsigned int'.  EMACS_INT arguments should use the pI macro, which
+   expands to whatever length modifier is needed for the target host.
 
    The width specifier supplies a lower limit for the length of the printed
    representation.  The padding, if any, normally goes on the left, but it goes
@@ -168,7 +171,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
   bufsize--;
 
   /* Loop until end of format string or buffer full. */
-  while (fmt != format_end && bufsize > 0)
+  while (fmt < format_end && bufsize > 0)
     {
       if (*fmt == '%')  /* Check for a '%' character */
         {
@@ -180,7 +183,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
           /* Copy this one %-spec into fmtcpy.  */
           string = fmtcpy;
           *string++ = '%';
-          while (1)
+          while (fmt < format_end)
             {
               *string++ = *fmt;
               if ('0' <= *fmt && *fmt <= '9')
@@ -190,7 +193,8 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
                      %1.1000f and %1000.1f both might need 1000+ bytes.
                      Parse the width or precision, checking for overflow.  */
                   size_t n = *fmt - '0';
-                  while ('0' <= fmt[1] && fmt[1] <= '9')
+                  while (fmt < format_end
+                         && '0' <= fmt[1] && fmt[1] <= '9')
                     {
                       if (n >= SIZE_MAX / 10
                           || n * 10 > SIZE_MAX - (fmt[1] - '0'))
@@ -206,20 +210,16 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
                 ;
               else if (*fmt == 'l')
                 {
-                  long_flag = 1;
-                  if (fmt[1] == 'l')
-                    {
-                      long_flag = 2;
-                      fmt++;
-                    }
-                  if (!strchr ("dox", fmt[1]))
-                    /* %l as conversion specifier, not as modifier.  */
-                    break;
+                  long_flag = 1 + (fmt + 1 < fmt_end && fmt[1] == 'l');
+                  fmt += long_flag;
+                  break;
                 }
               else
                 break;
               fmt++;
             }
+          if (fmt > format_end)
+            fmt = format_end;
           *string = 0;
 
           /* Make the size bound large enough to handle floating point formats
@@ -232,9 +232,8 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
           if (size_bound > size_allocated)
             {
               if (big_buffer)
-                big_buffer = (char *) xrealloc (big_buffer, size_bound);
-              else
-                big_buffer = (char *) xmalloc (size_bound);
+                xfree (big_buffer);
+              big_buffer = (char *) xmalloc (size_bound);
               sprintf_buffer = big_buffer;
               size_allocated = size_bound;
             }
@@ -242,7 +241,8 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
           switch (*fmt++)
             {
             default:
-              error ("Invalid format operation %%%c", fmt[-1]);
+              error ("Invalid format operation %%%s%c",
+                     long_flag ? "l" : "", fmt[-1]);
 
 /*          case 'b': */
             case 'l':
@@ -398,7 +398,7 @@ doprnt (char *buffer, register size_t bufsize, const char *format,
         char *save_bufptr = bufptr;
 
         do { *bufptr++ = *fmt++; }
-        while (--bufsize > 0 && !CHAR_HEAD_P (*fmt));
+        while (fmt < format_end && --bufsize > 0 && !CHAR_HEAD_P (*fmt));
         if (!CHAR_HEAD_P (*fmt))
           {
             bufptr = save_bufptr;
diff --git a/src/eval.c b/src/eval.c
index 8716ad78468..bcbbf740153 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1994,8 +1994,7 @@ verror (const char *m, va_list ap)
 {
   char buf[4000];
   size_t size = sizeof buf;
-  size_t size_max =
-    min (MOST_POSITIVE_FIXNUM, min (INT_MAX, SIZE_MAX - 1)) + 1;
+  size_t size_max =    min (MOST_POSITIVE_FIXNUM, SIZE_MAX);
   size_t mlen = strlen (m);
   char *buffer = buf;
   size_t used;