HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs--devo--0
[bpt/emacs.git]
/
src
/
doprnt.c
diff --git
a/src/doprnt.c
b/src/doprnt.c
index
873adca
..
bb8c582
100644
(file)
--- a/
src/doprnt.c
+++ b/
src/doprnt.c
@@
-1,7
+1,8
@@
/* Output like sprintf to a buffer of specified size.
Also takes args differently: pass one pointer to an array of strings
in addition to the format string which is separate.
/* Output like sprintf to a buffer of specified size.
Also takes args differently: pass one pointer to an array of strings
in addition to the format string which is separate.
- Copyright (C) 1985 Free Software Foundation, Inc.
+ Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+ 2006, 2007 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.
@@
-17,8
+18,8
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
-Boston, MA 0211
1-1307
, USA. */
+the Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+Boston, MA 0211
0-1301
, USA. */
#include <config.h>
#include <config.h>
@@
-105,7
+106,7
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
char tembuf[DBL_MAX_10_EXP + 100];
/* Size of sprintf_buffer. */
char tembuf[DBL_MAX_10_EXP + 100];
/* Size of sprintf_buffer. */
-
int
size_allocated = sizeof (tembuf);
+
unsigned
size_allocated = sizeof (tembuf);
/* Buffer to use for sprintf. Either tembuf or same as BIG_BUFFER. */
char *sprintf_buffer = tembuf;
/* Buffer to use for sprintf. Either tembuf or same as BIG_BUFFER. */
char *sprintf_buffer = tembuf;
@@
-135,12
+136,12
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
{
if (*fmt == '%') /* Check for a '%' character */
{
{
if (*fmt == '%') /* Check for a '%' character */
{
-
int
size_bound = 0;
+
unsigned
size_bound = 0;
int width; /* Columns occupied by STRING. */
fmt++;
/* Copy this one %-spec into fmtcpy. */
int width; /* Columns occupied by STRING. */
fmt++;
/* Copy this one %-spec into fmtcpy. */
- string = (unsigned char *)fmtcpy;
+ string = (unsigned char *)
fmtcpy;
*string++ = '%';
while (1)
{
*string++ = '%';
while (1)
{
@@
-151,11
+152,11
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
This might be a field width or a precision; e.g.
%1.1000f and %1000.1f both might need 1000+ bytes.
Parse the width or precision, checking for overflow. */
This might be a field width or a precision; e.g.
%1.1000f and %1000.1f both might need 1000+ bytes.
Parse the width or precision, checking for overflow. */
-
int
n = *fmt - '0';
+
unsigned
n = *fmt - '0';
while ('0' <= fmt[1] && fmt[1] <= '9')
{
if (n * 10 / 10 != n
while ('0' <= fmt[1] && fmt[1] <= '9')
{
if (n * 10 / 10 != n
- || (n = n * 10 + (fmt[1] - '0')) <
0
)
+ || (n = n * 10 + (fmt[1] - '0')) <
n
)
error ("Format width or precision too large");
*string++ = *++fmt;
}
error ("Format width or precision too large");
*string++ = *++fmt;
}
@@
-163,7
+164,7
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
if (size_bound < n)
size_bound = n;
}
if (size_bound < n)
size_bound = n;
}
- else if (*fmt == '-' || *fmt == ' ' || *fmt == '.')
+ else if (*fmt == '-' || *fmt == ' ' || *fmt == '.'
|| *fmt == '+'
)
;
else
break;
;
else
break;
@@
-173,10
+174,9
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
/* Make the size bound large enough to handle floating point formats
with large numbers. */
/* Make the size bound large enough to handle floating point formats
with large numbers. */
- size_bound += DBL_MAX_10_EXP + 50;
-
- if (size_bound < 0)
+ if (size_bound + DBL_MAX_10_EXP + 50 < size_bound)
error ("Format width or precision too large");
error ("Format width or precision too large");
+ size_bound += DBL_MAX_10_EXP + 50;
/* Make sure we have that much. */
if (size_bound > size_allocated)
/* Make sure we have that much. */
if (size_bound > size_allocated)
@@
-212,7
+212,7
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
abort ();
sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
/* Now copy into final output, truncating as nec. */
abort ();
sprintf (sprintf_buffer, fmtcpy, args[cnt++]);
/* Now copy into final output, truncating as nec. */
- string = (unsigned char *)sprintf_buffer;
+ string = (unsigned char *)
sprintf_buffer;
goto doit;
case 'f':
goto doit;
case 'f':
@@
-226,7
+226,7
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
u.half[1] = args[cnt++];
sprintf (sprintf_buffer, fmtcpy, u.d);
/* Now copy into final output, truncating as nec. */
u.half[1] = args[cnt++];
sprintf (sprintf_buffer, fmtcpy, u.d);
/* Now copy into final output, truncating as nec. */
- string = (unsigned char *)sprintf_buffer;
+ string = (unsigned char *)
sprintf_buffer;
goto doit;
}
goto doit;
}
@@
-239,13
+239,13
@@
doprnt1 (lispstrings, buffer, bufsize, format, format_end, nargs, args)
minlen = atoi (&fmtcpy[1]);
if (lispstrings)
{
minlen = atoi (&fmtcpy[1]);
if (lispstrings)
{
- string = ((struct Lisp_String *)args[cnt])->data;
- tem = STRING_BYTES ((struct Lisp_String *)args[cnt]);
+ string = ((struct Lisp_String *)
args[cnt])->data;
+ tem = STRING_BYTES ((struct Lisp_String *)
args[cnt]);
cnt++;
}
else
{
cnt++;
}
else
{
- string = (unsigned char *)args[cnt++];
+ string = (unsigned char *)
args[cnt++];
tem = strlen (string);
}
width = strwidth (string, tem);
tem = strlen (string);
}
width = strwidth (string, tem);