#include <config.h>
#include <stdio.h>
#include <ctype.h>
-#include "lisp.h"
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
#include <float.h>
#endif
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+#include <stdlib.h>
+#endif
+
+#include "lisp.h"
+
#ifndef DBL_MAX_10_EXP
#define DBL_MAX_10_EXP 308 /* IEEE double */
#endif
-extern long *xmalloc (), *xrealloc ();
+/* Since we use the macro CHAR_HEAD_P, we have to include this, but
+ don't have to include others because CHAR_HEAD_P does not contains
+ another macro. */
+#include "character.h"
static int doprnt1 ();
terminated at position FORMAT_END.
Output goes in BUFFER, which has room for BUFSIZE chars.
If the output does not fit, truncate it to fit.
- Returns the number of characters stored into BUFFER.
+ Returns the number of bytes stored into BUFFER.
ARGS points to the vector of arguments, and NARGS says how many.
A double counts as two arguments.
String arguments are passed as C strings.
Integers are passed as C integers. */
+int
doprnt (buffer, bufsize, format, format_end, nargs, args)
char *buffer;
register int bufsize;
/* Like doprnt except that strings in ARGS are passed
as Lisp_Object. */
+int
doprnt_lisp (buffer, bufsize, format, format_end, nargs, args)
char *buffer;
register int bufsize;
char *big_buffer = 0;
register int tem;
- char *string;
+ unsigned char *string;
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. */
+ unsigned char charbuf[5]; /* Used for %c. */
if (format_end == 0)
format_end = format + strlen (format);
if (*fmt == '%') /* Check for a '%' character */
{
int size_bound = 0;
+ int width; /* Columns occupied by STRING. */
fmt++;
/* Copy this one %-spec into fmtcpy. */
- string = fmtcpy;
+ string = (unsigned char *)fmtcpy;
*string++ = '%';
while (1)
{
abort ();
sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
/* Now copy into final output, truncating as nec. */
- string = sprintf_buffer;
+ string = (unsigned char *)sprintf_buffer;
goto doit;
case 'f':
{
union { double d; char *half[2]; } u;
if (cnt + 1 == nargs)
- error ("not enough arguments for format string");
+ error ("Not enough arguments for format string");
u.half[0] = args[cnt++];
u.half[1] = args[cnt++];
sprintf (sprintf_buffer, fmtcpy, u.d);
/* Now copy into final output, truncating as nec. */
- string = sprintf_buffer;
+ string = (unsigned char *)sprintf_buffer;
goto doit;
}
string[-1] = 's';
case 's':
if (cnt == nargs)
- error ("not enough arguments for format string");
+ error ("Not enough arguments for format string");
if (fmtcpy[1] != 's')
minlen = atoi (&fmtcpy[1]);
if (lispstrings)
{
- string = (char *) ((struct Lisp_String *)args[cnt])->data;
- tem = ((struct Lisp_String *)args[cnt])->size;
+ string = ((struct Lisp_String *)args[cnt])->data;
+ tem = STRING_BYTES ((struct Lisp_String *)args[cnt]);
cnt++;
}
else
{
- string = args[cnt++];
+ string = (unsigned char *)args[cnt++];
tem = strlen (string);
}
+ width = strwidth (string, tem);
goto doit1;
/* Copy string into final output, truncating if no room. */
doit:
- tem = strlen (string);
+ /* Coming here means STRING contains ASCII only. */
+ width = tem = strlen (string);
doit1:
+ /* We have already calculated:
+ TEM -- length of STRING,
+ WIDTH -- columns occupied by STRING when displayed, and
+ MINLEN -- minimum columns of the output. */
if (minlen > 0)
{
- while (minlen > tem && bufsize > 0)
+ while (minlen > width && bufsize > 0)
{
*bufptr++ = ' ';
bufsize--;
minlen = 0;
}
if (tem > bufsize)
- tem = bufsize;
- bcopy (string, bufptr, tem);
+ {
+ /* Truncate the string at character boundary. */
+ tem = bufsize;
+ while (!CHAR_HEAD_P (string[tem - 1])) tem--;
+ bcopy (string, bufptr, tem);
+ /* We must calculate WIDTH again. */
+ width = strwidth (bufptr, tem);
+ }
+ else
+ bcopy (string, bufptr, tem);
bufptr += tem;
bufsize -= tem;
if (minlen < 0)
{
- while (minlen < - tem && bufsize > 0)
+ while (minlen < - width && bufsize > 0)
{
*bufptr++ = ' ';
bufsize--;
case 'c':
if (cnt == nargs)
- error ("not enough arguments for format string");
- *charbuf = (EMACS_INT) args[cnt++];
+ error ("Not enough arguments for format string");
+ tem = CHAR_STRING ((int) (EMACS_INT) args[cnt], charbuf);
string = charbuf;
- tem = 1;
+ cnt++;
+ string[tem] = 0;
+ width = strwidth (string, tem);
if (fmtcpy[1] != 'c')
minlen = atoi (&fmtcpy[1]);
goto doit1;
fmt--; /* Drop thru and this % will be treated as normal */
}
}
- *bufptr++ = *fmt++; /* Just some characters; Copy 'em */
- bufsize--;
+
+ {
+ /* Just some character; Copy it if the whole multi-byte form
+ fit in the buffer. */
+ char *save_bufptr = bufptr;
+
+ do { *bufptr++ = *fmt++; }
+ while (--bufsize > 0 && !CHAR_HEAD_P (*fmt));
+ if (!CHAR_HEAD_P (*fmt))
+ {
+ bufptr = save_bufptr;
+ break;
+ }
+ }
};
/* If we had to malloc something, free it. */
HCoop / bpt / emacs.git / blobdiff