(Freplace_match): New arg SUBEXP.

[bpt/emacs.git] / src / doprnt.c

diff --git a/src/doprnt.c b/src/doprnt.c
index 731afe4..63f724c 100644 (file)
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -7,7 +7,7 @@ This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -20,9 +20,12 @@ along with GNU Emacs; see the file COPYING.  If not, write to
 the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 
+#include <config.h>
 #include <stdio.h>
 #include <ctype.h>
 
+extern long *xmalloc (), *xrealloc ();
+
 /* Generate output from a format-spec FORMAT,
    terminated at position FORMAT_END.
    Output goes in BUFFER, which has room for BUFSIZE chars.
@@ -42,45 +45,70 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
   int cnt = 0;                 /* Number of arg to gobble next */
   register char *fmt = format; /* Pointer into format string */
   register char *bufptr = buffer; /* Pointer into output buffer.. */
+
   /* Use this for sprintf unless we need something really big.  */
   char tembuf[100];
+
   /* Size of sprintf_buffer.  */
   int size_allocated = 100;
+
   /* Buffer to use for sprintf.  Either tembuf or same as BIG_BUFFER.  */
   char *sprintf_buffer = tembuf;
+
   /* Buffer we have got with malloc.  */
   char *big_buffer = 0;
+
   register int tem;
   char *string;
-  char fmtcpy[20];
+  char fixed_buffer[20];       /* Default buffer for small formatting. */
+  char *fmtcpy;
   int minlen;
   int size;                    /* Field width factor; e.g., %90d */
+  char charbuf[2];             /* Used for %c.  */
 
   if (format_end == 0)
     format_end = format + strlen (format);
 
+  if ((format_end - format + 1) < sizeof (fixed_buffer))
+    fmtcpy = fixed_buffer;
+  else
+    fmtcpy = (char *) alloca (format_end - format + 1);
+
   bufsize--;
-  while (fmt != format_end && bufsize > 0)     /* Loop until end of format
-                                                  string or buffer full */
+
+  /* Loop until end of format string or buffer full. */
+  while (fmt != format_end && bufsize > 0)
     {
       if (*fmt == '%') /* Check for a '%' character */
        {
          int size_bound;
 
          fmt++;
-         /* Copy this one %-spec into fmtcopy.  */
+         /* Copy this one %-spec into fmtcpy.  */
          string = fmtcpy;
          *string++ = '%';
          while (1)
            {
              *string++ = *fmt;
-             if (! (*fmt >= '0' && *fmt <= '9') && *fmt != '-' && *fmt != ' ')
+             if (! (*fmt >= '0' && *fmt <= '9')
+                 && *fmt != '-' && *fmt != ' '&& *fmt != '.')
                break;
              fmt++;
            }
          *string = 0;
          /* Get an idea of how much space we might need.  */
-         size_bound = atoi (&fmtcpy[1]) + 50;
+         size_bound = atoi (&fmtcpy[1]);
+
+         /* Avoid pitfall of negative "size" parameter ("%-200d"). */
+         if (size_bound < 0)
+           size_bound = -size_bound;
+         size_bound += 50;
+
+         if (size_bound > bufsize)
+           /* This is certainly enough that it doesn't matter
+              to lose the rest.  */
+           size_bound = bufsize + 100;
+
          /* Make sure we have that much.  */
          if (size_bound > size_allocated)
            {
@@ -102,7 +130,17 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
            case 'o':
            case 'x':
              if (cnt == nargs)
-               error ("Format string wants too many arguments");
+               error ("Not enough arguments for format string");
+             if (sizeof (int) == sizeof (EMACS_INT))
+               ;
+             else if (sizeof (long) == sizeof (EMACS_INT))
+               /* Insert an `l' the right place.  */
+               string[1] = string[0],
+               string[0] = string[-1],
+               string[-1] = 'l',
+               string++;
+             else
+               abort ();
              sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
              /* Now copy into final output, truncating as nec.  */
              string = sprintf_buffer;
@@ -114,7 +152,7 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
              {
                union { double d; char *half[2]; } u;
                if (cnt + 1 == nargs)
-                 error ("Format string wants too many arguments");
+                 error ("not enough arguments for format string");
                u.half[0] = args[cnt++];
                u.half[1] = args[cnt++];
                sprintf (sprintf_buffer, fmtcpy, u.d);
@@ -127,13 +165,14 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
              string[-1] = 's';
            case 's':
              if (cnt == nargs)
-               error ("Format string wants too many arguments");
+               error ("not enough arguments for format string");
              string = args[cnt++];
              if (fmtcpy[1] != 's')
                minlen = atoi (&fmtcpy[1]);
              /* Copy string into final output, truncating if no room.  */
            doit:
              tem = strlen (string);
+           doit1:
              if (minlen > 0)
                {
                  while (minlen > tem && bufsize > 0)
@@ -163,10 +202,13 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
 
            case 'c':
              if (cnt == nargs)
-               error ("Format string wants too many arguments");
-             *bufptr++ = (int) args[cnt++];
-             bufsize--;
-             continue;
+               error ("not enough arguments for format string");
+             *charbuf = (EMACS_INT) args[cnt++];
+             string = charbuf;
+             tem = 1;
+             if (fmtcpy[1] != 'c')
+               minlen = atoi (&fmtcpy[1]);
+             goto doit1;
 
            case '%':
              fmt--;    /* Drop thru and this % will be treated as normal */
@@ -178,7 +220,7 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
 
   /* If we had to malloc something, free it.  */
   if (big_buffer)
-    free (big_buffer);
+    xfree (big_buffer);
 
   *bufptr = 0;         /* Make sure our string end with a '\0' */
   return bufptr - buffer;