annotate src/doprnt.c @ 20700:524d1cfb6913

(WINDOW_RIGHT_MARGIN): Deduct width of vertical line if frame has no scroll bars.
author Richard M. Stallman <rms@gnu.org>
date Wed, 21 Jan 1998 21:43:58 +0000
parents 88d7475304df
children fa9ff387d260
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
1 /* Output like sprintf to a buffer of specified size.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
2 Also takes args differently: pass one pointer to an array of strings
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
3 in addition to the format string which is separate.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
4 Copyright (C) 1985 Free Software Foundation, Inc.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
5
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
6 This file is part of GNU Emacs.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
7
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
8 GNU Emacs is free software; you can redistribute it and/or modify
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
9 it under the terms of the GNU General Public License as published by
12244
ac7375e60931 Update GPL to version 2.
Karl Heuer <kwzh@gnu.org>
parents: 11700
diff changeset
10 the Free Software Foundation; either version 2, or (at your option)
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
11 any later version.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
12
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
13 GNU Emacs is distributed in the hope that it will be useful,
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
14 but WITHOUT ANY WARRANTY; without even the implied warranty of
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
16 GNU General Public License for more details.
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
17
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
19 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 13554
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 13554
diff changeset
21 Boston, MA 02111-1307, USA. */
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
22
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
23
5036
ef34c5a4d264 Include config.h.
Richard M. Stallman <rms@gnu.org>
parents: 4774
diff changeset
24 #include <config.h>
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
25 #include <stdio.h>
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
26 #include <ctype.h>
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
27
18681
a30375801ad7 Use #ifdef to test STDC_HEADERS.
Richard M. Stallman <rms@gnu.org>
parents: 18627
diff changeset
28 #ifdef STDC_HEADERS
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
29 #include <float.h>
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
30 #endif
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
31
18627
c372b7e6669b Include float.h before lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 17030
diff changeset
32 #include "lisp.h"
c372b7e6669b Include float.h before lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 17030
diff changeset
33
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
34 #ifndef DBL_MAX_10_EXP
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
35 #define DBL_MAX_10_EXP 308 /* IEEE double */
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
36 #endif
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
37
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
38 /* Since we use the macro CHAR_HEAD_P, we have to include this, but
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
39 don't have to include others because CHAR_HEAD_P does not contains
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
40 another macro. */
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
41 #include "charset.h"
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
42
11320
aaf81f284f83 (xmalloc, xrealloc): Declare them here.
Richard M. Stallman <rms@gnu.org>
parents: 8141
diff changeset
43 extern long *xmalloc (), *xrealloc ();
aaf81f284f83 (xmalloc, xrealloc): Declare them here.
Richard M. Stallman <rms@gnu.org>
parents: 8141
diff changeset
44
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
45 static int doprnt1 ();
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
46
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
47 /* Generate output from a format-spec FORMAT,
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
48 terminated at position FORMAT_END.
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
49 Output goes in BUFFER, which has room for BUFSIZE chars.
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
50 If the output does not fit, truncate it to fit.
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
51 Returns the number of characters stored into BUFFER.
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
52 ARGS points to the vector of arguments, and NARGS says how many.
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
53 A double counts as two arguments.
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
54 String arguments are passed as C strings.
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
55 Integers are passed as C integers. */
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
56
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
57 doprnt (buffer, bufsize, format, format_end, nargs, args)
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
58 char *buffer;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
59 register int bufsize;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
60 char *format;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
61 char *format_end;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
62 int nargs;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
63 char **args;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
64 {
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
65 return doprnt1 (0, buffer, bufsize, format, format_end, nargs, args);
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
66 }
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
67
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
68 /* Like doprnt except that strings in ARGS are passed
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
69 as Lisp_Object. */
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
70
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
71 doprnt_lisp (buffer, bufsize, format, format_end, nargs, args)
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
72 char *buffer;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
73 register int bufsize;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
74 char *format;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
75 char *format_end;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
76 int nargs;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
77 char **args;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
78 {
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
79 return doprnt1 (1, buffer, bufsize, format, format_end, nargs, args);
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
80 }
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
81
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
82 static int
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
83 doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
84 int lispstrings;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
85 char *buffer;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
86 register int bufsize;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
87 char *format;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
88 char *format_end;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
89 int nargs;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
90 char **args;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
91 {
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
92 int cnt = 0; /* Number of arg to gobble next */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
93 register char *fmt = format; /* Pointer into format string */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
94 register char *bufptr = buffer; /* Pointer into output buffer.. */
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
95
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
96 /* Use this for sprintf unless we need something really big. */
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
97 char tembuf[DBL_MAX_10_EXP + 100];
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
98
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
99 /* Size of sprintf_buffer. */
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
100 int size_allocated = sizeof (tembuf);
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
101
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
102 /* Buffer to use for sprintf. Either tembuf or same as BIG_BUFFER. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
103 char *sprintf_buffer = tembuf;
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
104
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
105 /* Buffer we have got with malloc. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
106 char *big_buffer = 0;
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
107
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
108 register int tem;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
109 char *string;
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
110 char fixed_buffer[20]; /* Default buffer for small formatting. */
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
111 char *fmtcpy;
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
112 int minlen;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
113 int size; /* Field width factor; e.g., %90d */
20310
b6fd8353113b (doprnt1): Declare `charbuf' as unsigned char.
Andreas Schwab <schwab@suse.de>
parents: 18681
diff changeset
114 unsigned char charbuf[5]; /* Used for %c. */
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
115
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
116 if (format_end == 0)
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
117 format_end = format + strlen (format);
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
118
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
119 if ((format_end - format + 1) < sizeof (fixed_buffer))
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
120 fmtcpy = fixed_buffer;
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
121 else
5053
b98e742f0b05 (doprnt): Cast the value alloca returns.
Richard M. Stallman <rms@gnu.org>
parents: 5036
diff changeset
122 fmtcpy = (char *) alloca (format_end - format + 1);
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
123
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
124 bufsize--;
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
125
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
126 /* Loop until end of format string or buffer full. */
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
127 while (fmt != format_end && bufsize > 0)
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
128 {
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
129 if (*fmt == '%') /* Check for a '%' character */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
130 {
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
131 int size_bound = 0;
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
132 int width; /* Columns occupied by STRING. */
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
133
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
134 fmt++;
484
3165b2697c78 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 147
diff changeset
135 /* Copy this one %-spec into fmtcpy. */
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
136 string = fmtcpy;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
137 *string++ = '%';
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
138 while (1)
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
139 {
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
140 *string++ = *fmt;
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
141 if ('0' <= *fmt && *fmt <= '9')
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
142 {
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
143 /* Get an idea of how much space we might need.
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
144 This might be a field width or a precision; e.g.
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
145 %1.1000f and %1000.1f both might need 1000+ bytes.
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
146 Parse the width or precision, checking for overflow. */
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
147 int n = *fmt - '0';
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
148 while ('0' <= fmt[1] && fmt[1] <= '9')
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
149 {
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
150 if (n * 10 / 10 != n
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
151 || (n = n * 10 + (fmt[1] - '0')) < 0)
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
152 error ("Format width or precision too large");
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
153 *string++ = *++fmt;
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
154 }
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
155
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
156 if (size_bound < n)
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
157 size_bound = n;
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
158 }
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
159 else if (*fmt == '-' || *fmt == ' ' || *fmt == '.')
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
160 ;
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
161 else
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
162 break;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
163 fmt++;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
164 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
165 *string = 0;
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
166
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
167 /* Make the size bound large enough to handle floating point formats
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
168 with large numbers. */
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
169 size_bound += DBL_MAX_10_EXP + 50;
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
170
4774
8e36034f65e2 (doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents: 2439
diff changeset
171 if (size_bound < 0)
16943
e7814b054e91 Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents: 16096
diff changeset
172 error ("Format width or precision too large");
12797
f0724d9d625e (doprnt): Don't let size_bound be gigantic. Fix error message.
Richard M. Stallman <rms@gnu.org>
parents: 12244
diff changeset
173
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
174 /* Make sure we have that much. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
175 if (size_bound > size_allocated)
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
176 {
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
177 if (big_buffer)
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
178 big_buffer = (char *) xrealloc (big_buffer, size_bound);
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
179 else
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
180 big_buffer = (char *) xmalloc (size_bound);
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
181 sprintf_buffer = big_buffer;
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
182 size_allocated = size_bound;
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
183 }
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
184 minlen = 0;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
185 switch (*fmt++)
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
186 {
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
187 default:
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
188 error ("Invalid format operation %%%c", fmt[-1]);
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
189
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
190 /* case 'b': */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
191 case 'd':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
192 case 'o':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
193 case 'x':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
194 if (cnt == nargs)
12797
f0724d9d625e (doprnt): Don't let size_bound be gigantic. Fix error message.
Richard M. Stallman <rms@gnu.org>
parents: 12244
diff changeset
195 error ("Not enough arguments for format string");
11700
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
196 if (sizeof (int) == sizeof (EMACS_INT))
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
197 ;
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
198 else if (sizeof (long) == sizeof (EMACS_INT))
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
199 /* Insert an `l' the right place. */
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
200 string[1] = string[0],
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
201 string[0] = string[-1],
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
202 string[-1] = 'l',
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
203 string++;
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
204 else
79358a3240fe (doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents: 11320
diff changeset
205 abort ();
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
206 sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
207 /* Now copy into final output, truncating as nec. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
208 string = sprintf_buffer;
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
209 goto doit;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
210
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
211 case 'f':
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
212 case 'e':
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
213 case 'g':
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
214 {
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
215 union { double d; char *half[2]; } u;
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
216 if (cnt + 1 == nargs)
6715
3864d274a56c (doprnt): Reword confusing error message.
Karl Heuer <kwzh@gnu.org>
parents: 6236
diff changeset
217 error ("not enough arguments for format string");
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
218 u.half[0] = args[cnt++];
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
219 u.half[1] = args[cnt++];
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
220 sprintf (sprintf_buffer, fmtcpy, u.d);
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
221 /* Now copy into final output, truncating as nec. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
222 string = sprintf_buffer;
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
223 goto doit;
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
224 }
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
225
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
226 case 'S':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
227 string[-1] = 's';
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
228 case 's':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
229 if (cnt == nargs)
6715
3864d274a56c (doprnt): Reword confusing error message.
Karl Heuer <kwzh@gnu.org>
parents: 6236
diff changeset
230 error ("not enough arguments for format string");
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
231 if (fmtcpy[1] != 's')
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
232 minlen = atoi (&fmtcpy[1]);
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
233 if (lispstrings)
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
234 {
16096
aa25c2ac018b (doprnt1): If lispstrings, accept a string
Richard M. Stallman <rms@gnu.org>
parents: 14690
diff changeset
235 string = (char *) ((struct Lisp_String *)args[cnt])->data;
aa25c2ac018b (doprnt1): If lispstrings, accept a string
Richard M. Stallman <rms@gnu.org>
parents: 14690
diff changeset
236 tem = ((struct Lisp_String *)args[cnt])->size;
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
237 cnt++;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
238 }
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
239 else
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
240 {
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
241 string = args[cnt++];
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
242 tem = strlen (string);
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
243 }
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
244 width = strwidth (string, tem);
13449
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
245 goto doit1;
2e9306561b80 Include lisp.h.
Richard M. Stallman <rms@gnu.org>
parents: 13363
diff changeset
246
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
247 /* Copy string into final output, truncating if no room. */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
248 doit:
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
249 /* Coming here means STRING contains ASCII only. */
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
250 width = tem = strlen (string);
8141
e3859c43c6f4 (doprnt): Handle padding on %c.
Richard M. Stallman <rms@gnu.org>
parents: 6715
diff changeset
251 doit1:
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
252 /* We have already calculated:
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
253 TEM -- length of STRING,
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
254 WIDTH -- columns occupied by STRING when displayed, and
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
255 MINLEN -- minimum columns of the output. */
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
256 if (minlen > 0)
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
257 {
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
258 while (minlen > width && bufsize > 0)
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
259 {
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
260 *bufptr++ = ' ';
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
261 bufsize--;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
262 minlen--;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
263 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
264 minlen = 0;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
265 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
266 if (tem > bufsize)
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
267 {
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
268 /* Truncate the string at character boundary. */
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
269 tem = bufsize;
20530
88d7475304df (doprnt1): Call to CHAR_HEAD_P fixed.
Richard M. Stallman <rms@gnu.org>
parents: 20310
diff changeset
270 while (!CHAR_HEAD_P (string[tem - 1])) tem--;
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
271 bcopy (string, bufptr, tem);
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
272 /* We must calculate WIDTH again. */
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
273 width = strwidth (bufptr, tem);
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
274 }
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
275 else
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
276 bcopy (string, bufptr, tem);
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
277 bufptr += tem;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
278 bufsize -= tem;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
279 if (minlen < 0)
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
280 {
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
281 while (minlen < - width && bufsize > 0)
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
282 {
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
283 *bufptr++ = ' ';
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
284 bufsize--;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
285 minlen++;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
286 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
287 minlen = 0;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
288 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
289 continue;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
290
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
291 case 'c':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
292 if (cnt == nargs)
6715
3864d274a56c (doprnt): Reword confusing error message.
Karl Heuer <kwzh@gnu.org>
parents: 6236
diff changeset
293 error ("not enough arguments for format string");
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
294 tem = CHAR_STRING ((EMACS_INT) args[cnt], charbuf, string);
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
295 cnt++;
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
296 string[tem] = 0;
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
297 width = strwidth (string, tem);
8141
e3859c43c6f4 (doprnt): Handle padding on %c.
Richard M. Stallman <rms@gnu.org>
parents: 6715
diff changeset
298 if (fmtcpy[1] != 'c')
e3859c43c6f4 (doprnt): Handle padding on %c.
Richard M. Stallman <rms@gnu.org>
parents: 6715
diff changeset
299 minlen = atoi (&fmtcpy[1]);
e3859c43c6f4 (doprnt): Handle padding on %c.
Richard M. Stallman <rms@gnu.org>
parents: 6715
diff changeset
300 goto doit1;
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
301
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
302 case '%':
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
303 fmt--; /* Drop thru and this % will be treated as normal */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
304 }
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
305 }
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
306
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
307 {
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
308 /* Just some character; Copy it if the whole multi-byte form
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
309 fit in the buffer. */
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
310 char *save_bufptr = bufptr;
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
311
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
312 do { *bufptr++ = *fmt++; }
20530
88d7475304df (doprnt1): Call to CHAR_HEAD_P fixed.
Richard M. Stallman <rms@gnu.org>
parents: 20310
diff changeset
313 while (--bufsize > 0 && !CHAR_HEAD_P (*fmt));
88d7475304df (doprnt1): Call to CHAR_HEAD_P fixed.
Richard M. Stallman <rms@gnu.org>
parents: 20310
diff changeset
314 if (!CHAR_HEAD_P (*fmt))
17030
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
315 {
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
316 bufptr = save_bufptr;
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
317 break;
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
318 }
42d758739319 Include charset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16943
diff changeset
319 }
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
320 };
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
321
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
322 /* If we had to malloc something, free it. */
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
323 if (big_buffer)
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 484
diff changeset
324 xfree (big_buffer);
147
0f50f1badd75 *** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents: 116
diff changeset
325
49
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
326 *bufptr = 0; /* Make sure our string end with a '\0' */
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
327 return bufptr - buffer;
94e408cdb3ce Initial revision
Joseph Arceneaux <jla@gnu.org>
parents:
diff changeset
328 }