(add_properties, remove_properties, set_properties):

[gnu-emacs] / src / doprnt.c

diff --git a/src/doprnt.c b/src/doprnt.c
index 303846124f4c6cbd1cd1f6bddb0d0dd4b65cbaae..07ce5b88ed3952164934558989d0cc7ce7b85be1 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,
@@ -23,6 +23,11 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <config.h>
 #include <stdio.h>
 #include <ctype.h>
+#include "lisp.h"
+
+extern long *xmalloc (), *xrealloc ();
+
+static int doprnt1 ();
 
 /* Generate output from a format-spec FORMAT,
    terminated at position FORMAT_END.
@@ -30,7 +35,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    If the output does not fit, truncate it to fit.
    Returns the number of characters stored into BUFFER.
    ARGS points to the vector of arguments, and NARGS says how many.
-   A double counts as two arguments.  */
+   A double counts as two arguments.
+   String arguments are passed as C strings.
+   Integers are passed as C integers.  */
 
 doprnt (buffer, bufsize, format, format_end, nargs, args)
      char *buffer;
@@ -39,6 +46,33 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
      char *format_end;
      int nargs;
      char **args;
+{
+  return doprnt1 (0, buffer, bufsize, format, format_end, nargs, args);
+}
+
+/* Like doprnt except that strings in ARGS are passed
+   as Lisp_Object.  */
+
+doprnt_lisp (buffer, bufsize, format, format_end, nargs, args)
+     char *buffer;
+     register int bufsize;
+     char *format;
+     char *format_end;
+     int nargs;
+     char **args;
+{
+  return doprnt1 (1, buffer, bufsize, format, format_end, nargs, args);
+}
+
+static int
+doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
+     int lispstrings;
+     char *buffer;
+     register int bufsize;
+     char *format;
+     char *format_end;
+     int nargs;
+     char **args;
 {
   int cnt = 0;                 /* Number of arg to gobble next */
   register char *fmt = format; /* Pointer into format string */
@@ -62,6 +96,7 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
   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);
@@ -101,6 +136,9 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
            size_bound = -size_bound;
          size_bound += 50;
 
+         if (size_bound > (unsigned) (1 << (BITS_PER_INT - 1)))
+           error ("Format padding too large");
+
          /* Make sure we have that much.  */
          if (size_bound > size_allocated)
            {
@@ -122,7 +160,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;
@@ -134,7 +182,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);
@@ -147,13 +195,26 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
              string[-1] = 's';
            case 's':
              if (cnt == nargs)
-               error ("Format string wants too many arguments");
-             string = args[cnt++];
+               error ("not enough arguments for format string");
              if (fmtcpy[1] != 's')
                minlen = atoi (&fmtcpy[1]);
+             if (lispstrings)
+               {
+                 string = (char *) XSTRING (((Lisp_Object *) args)[cnt])->data;
+                 tem = XSTRING (((Lisp_Object *) args)[cnt])->size;
+                 cnt++;
+               }
+             else
+               {
+                 string = args[cnt++];
+                 tem = strlen (string);
+               }
+             goto doit1;
+
              /* Copy string into final output, truncating if no room.  */
            doit:
              tem = strlen (string);
+           doit1:
              if (minlen > 0)
                {
                  while (minlen > tem && bufsize > 0)
@@ -166,7 +227,7 @@ doprnt (buffer, bufsize, format, format_end, nargs, args)
                }
              if (tem > bufsize)
                tem = bufsize;
-             strncpy (bufptr, string, tem);
+             bcopy (string, bufptr, tem);
              bufptr += tem;
              bufsize -= tem;
              if (minlen < 0)
@@ -183,10 +244,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 */