Mercurial > emacs
annotate src/doprnt.c @ 110729:99084f50aa8e
Remove unused arguments for unexec.
The third one is never used, and the last two are always passed as zero.
* src/emacs.c (unexec): Add declaration.
(Fdump_emacs): Only pass the first two arguments to unexec.
Simplify #ifdef.
* src/unexw32.c (unexec):
* src/unexsol.c (unexec):
* src/unexhp9k800.c (unexec):
* src/unexcw.c (unexec): Remove the last 3 arguments, unused.
* src/unexelf.c (unexec): Remove the last 3 arguments, unused.
(find_section): Use const.
* src/unexmacosx.c (unexec): Remove the last 3 arguments, unused.
(unexec_error): Declare it NO_RETURN.
* src/unexcoff.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.
* src/unexaix.c (make_hdr): Assume bss_start is always zero, remove
it as an argument, remove data_start and entry_address arguments, unused.
(unexec): Remove bss_start, data_start and
entry_address arguments.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Sun, 03 Oct 2010 06:59:56 -0700 |
parents | 43adca79c8fd |
children | 417b1e4d63cd 7df2e30d72ec |
rev | line source |
---|---|
49 | 1 /* Output like sprintf to a buffer of specified size. |
2 Also takes args differently: pass one pointer to an array of strings | |
3 in addition to the format string which is separate. | |
75227
e90d04cd455a
Update copyright for years from Emacs 21 to present (mainly adding
Glenn Morris <rgm@gnu.org>
parents:
68651
diff
changeset
|
4 Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005, |
106815 | 5 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
49 | 6 |
7 This file is part of GNU Emacs. | |
8 | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
9 GNU Emacs is free software: you can redistribute it and/or modify |
49 | 10 it under the terms of the GNU General Public License as published by |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
11 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
12 (at your option) any later version. |
49 | 13 |
14 GNU Emacs is distributed in the hope that it will be useful, | |
15 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 GNU General Public License for more details. | |
18 | |
19 You should have received a copy of the GNU General Public License | |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
91327
diff
changeset
|
20 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
49 | 21 |
22 | |
5036 | 23 #include <config.h> |
49 | 24 #include <stdio.h> |
25 #include <ctype.h> | |
105669
68dd71358159
* alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
104223
diff
changeset
|
26 #include <setjmp.h> |
49 | 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 |
25323 | 32 #ifdef HAVE_UNISTD_H |
33 #include <unistd.h> | |
34 #endif | |
35 | |
18627
c372b7e6669b
Include float.h before lisp.h.
Richard M. Stallman <rms@gnu.org>
parents:
17030
diff
changeset
|
36 #include "lisp.h" |
c372b7e6669b
Include float.h before lisp.h.
Richard M. Stallman <rms@gnu.org>
parents:
17030
diff
changeset
|
37 |
17030 | 38 /* Since we use the macro CHAR_HEAD_P, we have to include this, but |
39 don't have to include others because CHAR_HEAD_P does not contains | |
40 another macro. */ | |
88351
aac41b50c875
Include "character.h" instead of "charset.h".
Kenichi Handa <handa@m17n.org>
parents:
42859
diff
changeset
|
41 #include "character.h" |
17030 | 42 |
110459
7ea64e427cb0
* src/doprnt.c: Do not include stdlib.h, config.h does it.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109313
diff
changeset
|
43 #ifndef DBL_MAX_10_EXP |
7ea64e427cb0
* src/doprnt.c: Do not include stdlib.h, config.h does it.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109313
diff
changeset
|
44 #define DBL_MAX_10_EXP 308 /* IEEE double */ |
7ea64e427cb0
* src/doprnt.c: Do not include stdlib.h, config.h does it.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109313
diff
changeset
|
45 #endif |
7ea64e427cb0
* src/doprnt.c: Do not include stdlib.h, config.h does it.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
109313
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. |
49442 | 51 Returns the number of bytes stored into BUFFER. |
147
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 | 53 A double counts as two arguments. |
54 String arguments are passed as C strings. | |
55 Integers are passed as C integers. */ | |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
56 |
110513
43adca79c8fd
Clean up EMACS_INT/int usage in doc.c and doprnt.c.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110459
diff
changeset
|
57 EMACS_INT |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109308
diff
changeset
|
58 doprnt (char *buffer, register int bufsize, const char *format, |
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109308
diff
changeset
|
59 const char *format_end, va_list ap) |
49 | 60 { |
109313
e856a274549b
Constify functions taking char *
Andreas Schwab <schwab@linux-m68k.org>
parents:
109308
diff
changeset
|
61 const char *fmt = format; /* Pointer into format string */ |
49 | 62 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
|
63 |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
64 /* 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
|
65 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
|
66 |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
67 /* Size of sprintf_buffer. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
68 unsigned size_allocated = sizeof (tembuf); |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
69 |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
70 /* 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
|
71 char *sprintf_buffer = tembuf; |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
72 |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
73 /* Buffer we have got with malloc. */ |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
74 char *big_buffer = 0; |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
75 |
49 | 76 register int tem; |
22310
c68a115303f7
(doprnt1): Fix char signedness mismatches.
Karl Heuer <kwzh@gnu.org>
parents:
21993
diff
changeset
|
77 unsigned char *string; |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
78 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
|
79 char *fmtcpy; |
49 | 80 int minlen; |
100125
e41ac6b691bb
(doprnt1): Fix size of charbuf.
Andreas Schwab <schwab@suse.de>
parents:
95481
diff
changeset
|
81 unsigned char charbuf[MAX_MULTIBYTE_LENGTH + 1]; /* Used for %c. */ |
49 | 82 |
83 if (format_end == 0) | |
84 format_end = format + strlen (format); | |
85 | |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
86 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
|
87 fmtcpy = fixed_buffer; |
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
88 else |
5053
b98e742f0b05
(doprnt): Cast the value alloca returns.
Richard M. Stallman <rms@gnu.org>
parents:
5036
diff
changeset
|
89 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
|
90 |
49 | 91 bufsize--; |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
92 |
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
93 /* 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
|
94 while (fmt != format_end && bufsize > 0) |
49 | 95 { |
96 if (*fmt == '%') /* Check for a '%' character */ | |
97 { | |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
98 unsigned size_bound = 0; |
110513
43adca79c8fd
Clean up EMACS_INT/int usage in doc.c and doprnt.c.
Lars Magne Ingebrigtsen <larsi@gnus.org>
parents:
110459
diff
changeset
|
99 EMACS_INT width; /* Columns occupied by STRING. */ |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
100 |
49 | 101 fmt++; |
484 | 102 /* Copy this one %-spec into fmtcpy. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
103 string = (unsigned char *) fmtcpy; |
49 | 104 *string++ = '%'; |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
105 while (1) |
49 | 106 { |
107 *string++ = *fmt; | |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
108 if ('0' <= *fmt && *fmt <= '9') |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
109 { |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
110 /* 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
|
111 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
|
112 %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
|
113 Parse the width or precision, checking for overflow. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
114 unsigned n = *fmt - '0'; |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
115 while ('0' <= fmt[1] && fmt[1] <= '9') |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
116 { |
105698
a08904175e1a
(doprnt): Fix overflow check.
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
117 if (n * 10 + fmt[1] - '0' < n) |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
118 error ("Format width or precision too large"); |
105698
a08904175e1a
(doprnt): Fix overflow check.
Andreas Schwab <schwab@linux-m68k.org>
parents:
105669
diff
changeset
|
119 n = n * 10 + fmt[1] - '0'; |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
120 *string++ = *++fmt; |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
121 } |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
122 |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
123 if (size_bound < n) |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
124 size_bound = n; |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
125 } |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
126 else if (*fmt == '-' || *fmt == ' ' || *fmt == '.' || *fmt == '+') |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
127 ; |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
128 else |
49 | 129 break; |
130 fmt++; | |
131 } | |
132 *string = 0; | |
4774
8e36034f65e2
(doprnt): Use a fixed buffer to store the format
Brian Fox <bfox@gnu.org>
parents:
2439
diff
changeset
|
133 |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
134 /* 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
|
135 with large numbers. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
136 if (size_bound + DBL_MAX_10_EXP + 50 < size_bound) |
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
137 error ("Format width or precision too large"); |
16943
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
138 size_bound += DBL_MAX_10_EXP + 50; |
e7814b054e91
Include <float.h> if STDC_HEADERS.
Paul Eggert <eggert@twinsun.com>
parents:
16096
diff
changeset
|
139 |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
140 /* Make sure we have that much. */ |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
141 if (size_bound > size_allocated) |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
142 { |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
143 if (big_buffer) |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
144 big_buffer = (char *) xrealloc (big_buffer, size_bound); |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
145 else |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
146 big_buffer = (char *) xmalloc (size_bound); |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
147 sprintf_buffer = big_buffer; |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
148 size_allocated = size_bound; |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
149 } |
49 | 150 minlen = 0; |
151 switch (*fmt++) | |
152 { | |
153 default: | |
154 error ("Invalid format operation %%%c", fmt[-1]); | |
155 | |
156 /* case 'b': */ | |
157 case 'd': | |
158 case 'o': | |
159 case 'x': | |
11700
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
160 if (sizeof (int) == sizeof (EMACS_INT)) |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
161 ; |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
162 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
|
163 /* Insert an `l' the right place. */ |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
164 string[1] = string[0], |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
165 string[0] = string[-1], |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
166 string[-1] = 'l', |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
167 string++; |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
168 else |
79358a3240fe
(doprnt): Handle long EMACS_INT in sprintf.
Richard M. Stallman <rms@gnu.org>
parents:
11320
diff
changeset
|
169 abort (); |
109308
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
170 sprintf (sprintf_buffer, fmtcpy, va_arg(ap, char *)); |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
171 /* Now copy into final output, truncating as nec. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
172 string = (unsigned char *) sprintf_buffer; |
49 | 173 goto doit; |
174 | |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
175 case 'f': |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
176 case 'e': |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
177 case 'g': |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
178 { |
109308
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
179 double d = va_arg(ap, double); |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
180 sprintf (sprintf_buffer, fmtcpy, d); |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
181 /* Now copy into final output, truncating as nec. */ |
75950
f7b102b31618
(doprnt1): Add support for '+' flag. Fix overflow checking.
Andreas Schwab <schwab@suse.de>
parents:
75227
diff
changeset
|
182 string = (unsigned char *) sprintf_buffer; |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
183 goto doit; |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
184 } |
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
185 |
49 | 186 case 'S': |
187 string[-1] = 's'; | |
188 case 's': | |
189 if (fmtcpy[1] != 's') | |
190 minlen = atoi (&fmtcpy[1]); | |
109308
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
191 string = va_arg(ap, unsigned char *); |
104223
ec260849ffe1
* doprnt.c (doprnt_lisp): Unused function deleted.
Ken Raeburn <raeburn@raeburn.org>
parents:
100951
diff
changeset
|
192 tem = strlen (string); |
17030 | 193 width = strwidth (string, tem); |
13449 | 194 goto doit1; |
195 | |
49 | 196 /* Copy string into final output, truncating if no room. */ |
197 doit: | |
17030 | 198 /* Coming here means STRING contains ASCII only. */ |
199 width = tem = strlen (string); | |
8141
e3859c43c6f4
(doprnt): Handle padding on %c.
Richard M. Stallman <rms@gnu.org>
parents:
6715
diff
changeset
|
200 doit1: |
17030 | 201 /* We have already calculated: |
202 TEM -- length of STRING, | |
203 WIDTH -- columns occupied by STRING when displayed, and | |
204 MINLEN -- minimum columns of the output. */ | |
49 | 205 if (minlen > 0) |
206 { | |
17030 | 207 while (minlen > width && bufsize > 0) |
49 | 208 { |
209 *bufptr++ = ' '; | |
210 bufsize--; | |
211 minlen--; | |
212 } | |
213 minlen = 0; | |
214 } | |
215 if (tem > bufsize) | |
17030 | 216 { |
217 /* Truncate the string at character boundary. */ | |
218 tem = bufsize; | |
20530
88d7475304df
(doprnt1): Call to CHAR_HEAD_P fixed.
Richard M. Stallman <rms@gnu.org>
parents:
20310
diff
changeset
|
219 while (!CHAR_HEAD_P (string[tem - 1])) tem--; |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
220 memcpy (bufptr, string, tem); |
17030 | 221 /* We must calculate WIDTH again. */ |
222 width = strwidth (bufptr, tem); | |
223 } | |
224 else | |
109165
750db9f3e6d8
Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents:
109139
diff
changeset
|
225 memcpy (bufptr, string, tem); |
49 | 226 bufptr += tem; |
227 bufsize -= tem; | |
228 if (minlen < 0) | |
229 { | |
17030 | 230 while (minlen < - width && bufsize > 0) |
49 | 231 { |
232 *bufptr++ = ' '; | |
233 bufsize--; | |
234 minlen++; | |
235 } | |
236 minlen = 0; | |
237 } | |
238 continue; | |
239 | |
240 case 'c': | |
109308
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
241 { |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
242 /* Sometimes for %c we pass a char, which would widen |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
243 to int. Sometimes we pass XFASTINT() or XINT() |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
244 values, which would be EMACS_INT. Let's hope that |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
245 both are passed the same way, otherwise we'll need |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
246 to rewrite callers. */ |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
247 EMACS_INT chr = va_arg(ap, EMACS_INT); |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
248 tem = CHAR_STRING ((int) chr, charbuf); |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
249 string = charbuf; |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
250 string[tem] = 0; |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
251 width = strwidth (string, tem); |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
252 if (fmtcpy[1] != 'c') |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
253 minlen = atoi (&fmtcpy[1]); |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
254 goto doit1; |
3200fb11db9d
Make doprnt and related functions ANSI C compliant, with prototypes.
Ken Raeburn <raeburn@raeburn.org>
parents:
109165
diff
changeset
|
255 } |
49 | 256 |
257 case '%': | |
258 fmt--; /* Drop thru and this % will be treated as normal */ | |
259 } | |
260 } | |
17030 | 261 |
262 { | |
263 /* Just some character; Copy it if the whole multi-byte form | |
264 fit in the buffer. */ | |
265 char *save_bufptr = bufptr; | |
266 | |
267 do { *bufptr++ = *fmt++; } | |
20530
88d7475304df
(doprnt1): Call to CHAR_HEAD_P fixed.
Richard M. Stallman <rms@gnu.org>
parents:
20310
diff
changeset
|
268 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
|
269 if (!CHAR_HEAD_P (*fmt)) |
17030 | 270 { |
271 bufptr = save_bufptr; | |
272 break; | |
273 } | |
274 } | |
49 | 275 }; |
276 | |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
277 /* If we had to malloc something, free it. */ |
95481
4390d64d3328
Make "xfree (NULL)" a no-op; remove useless if-before-xfree.
Jim Meyering <jim@meyering.net>
parents:
94963
diff
changeset
|
278 xfree (big_buffer); |
147
0f50f1badd75
*** empty log message ***
Richard M. Stallman <rms@gnu.org>
parents:
116
diff
changeset
|
279 |
49 | 280 *bufptr = 0; /* Make sure our string end with a '\0' */ |
281 return bufptr - buffer; | |
282 } | |
52401 | 283 |
284 /* arch-tag: aa0ab528-7c5f-4c73-894c-aa2526a1efb3 | |
285 (do not change this comment) */ |