mirror of
https://github.com/postgres/postgres.git
synced 2025-05-06 19:59:18 +03:00
Fix snprintf.c for machines that don't have long long, like some Irix.
This commit is contained in:
Bruce Momjian
parent
7d4b59f024
commit
9549a8cd7d
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.82 1998/09/23 04:22:05 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/commands/vacuum.c,v 1.83 1998/10/07 17:12:50 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -576,8 +576,8 @@ vc_vacone(Oid relid, bool analyze, List *va_cols)
|
||||
heap_close(rel);
|
||||
|
||||
/* update statistics in pg_class */
|
||||
vc_updstats(vacrelstats->relid, vacrelstats->num_pages, vacrelstats->num_tuples,
|
||||
vacrelstats->hasindex, vacrelstats);
|
||||
vc_updstats(vacrelstats->relid, vacrelstats->num_pages,
|
||||
vacrelstats->num_tuples, vacrelstats->hasindex, vacrelstats);
|
||||
|
||||
/* next command frees attribute stats */
|
||||
|
||||
|
||||
@ -49,7 +49,9 @@
|
||||
#include <sys/param.h>
|
||||
|
||||
/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */
|
||||
#ifdef HAVE_LONG_INT_64
|
||||
typedef long long long_long;
|
||||
#endif
|
||||
|
||||
/*
|
||||
** SNPRINTF, VSNPRINT -- counted versions of printf
|
||||
@ -73,7 +75,7 @@ typedef long long long_long;
|
||||
* causing nast effects.
|
||||
**************************************************************/
|
||||
|
||||
/*static char _id[] = "$Id: snprintf.c,v 1.8 1998/10/02 15:38:01 momjian Exp $";*/
|
||||
/*static char _id[] = "$Id: snprintf.c,v 1.9 1998/10/07 17:12:52 momjian Exp $";*/
|
||||
static char *end;
|
||||
static int SnprfOverflow;
|
||||
|
||||
@ -85,6 +87,7 @@ int
|
||||
snprintf(char *str, size_t count, const char *fmt,...)
|
||||
{
|
||||
int len;
|
||||
|
||||
VA_LOCAL_DECL
|
||||
|
||||
VA_START(fmt);
|
||||
@ -136,29 +139,42 @@ dopr (char *buffer, const char *format, ... )
|
||||
int ljust;
|
||||
int len;
|
||||
int zpad;
|
||||
|
||||
VA_LOCAL_DECL
|
||||
|
||||
VA_START(format);
|
||||
|
||||
output = buffer;
|
||||
while( (ch = *format++) ){
|
||||
switch( ch ){
|
||||
while ((ch = *format++))
|
||||
{
|
||||
switch (ch)
|
||||
{
|
||||
case '%':
|
||||
ljust = len = zpad = maxwidth = 0;
|
||||
longflag = pointflag = 0;
|
||||
nextch:
|
||||
ch = *format++;
|
||||
switch( ch ){
|
||||
switch (ch)
|
||||
{
|
||||
case 0:
|
||||
dostr("**end of format**", 0);
|
||||
VA_END;
|
||||
return;
|
||||
case '-': ljust = 1; goto nextch;
|
||||
case '-':
|
||||
ljust = 1;
|
||||
goto nextch;
|
||||
case '0': /* set zero padding if len not set */
|
||||
if(len==0 && !pointflag) zpad = '0';
|
||||
case '1': case '2': case '3':
|
||||
case '4': case '5': case '6':
|
||||
case '7': case '8': case '9':
|
||||
if (len == 0 && !pointflag)
|
||||
zpad = '0';
|
||||
case '1':
|
||||
case '2':
|
||||
case '3':
|
||||
case '4':
|
||||
case '5':
|
||||
case '6':
|
||||
case '7':
|
||||
case '8':
|
||||
case '9':
|
||||
if (pointflag)
|
||||
maxwidth = maxwidth * 10 + ch - '0';
|
||||
else
|
||||
@ -170,56 +186,71 @@ dopr (char *buffer, const char *format, ... )
|
||||
else
|
||||
len = va_arg(args, int);
|
||||
goto nextch;
|
||||
case '.': pointflag = 1; goto nextch;
|
||||
case 'l': if(longflag) {
|
||||
longlongflag = 1; goto nextch;
|
||||
} else {
|
||||
longflag = 1; goto nextch;
|
||||
case '.':
|
||||
pointflag = 1;
|
||||
goto nextch;
|
||||
case 'l':
|
||||
if (longflag)
|
||||
{
|
||||
longlongflag = 1;
|
||||
goto nextch;
|
||||
}
|
||||
case 'u': case 'U':
|
||||
else
|
||||
{
|
||||
longflag = 1;
|
||||
goto nextch;
|
||||
}
|
||||
case 'u':
|
||||
case 'U':
|
||||
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
||||
if( longflag ){
|
||||
if (longflag)
|
||||
value = va_arg(args, long);
|
||||
} else {
|
||||
else
|
||||
value = va_arg(args, int);
|
||||
}
|
||||
fmtnum( value, 10,0, ljust, len, zpad ); break;
|
||||
case 'o': case 'O':
|
||||
fmtnum(value, 10, 0, ljust, len, zpad);
|
||||
break;
|
||||
case 'o':
|
||||
case 'O':
|
||||
/* fmtnum(value,base,dosign,ljust,len,zpad) */
|
||||
if( longflag ){
|
||||
if (longflag)
|
||||
value = va_arg(args, long);
|
||||
} else {
|
||||
else
|
||||
value = va_arg(args, int);
|
||||
}
|
||||
fmtnum( value, 8,0, ljust, len, zpad ); break;
|
||||
case 'd': case 'D':
|
||||
if( longflag ){
|
||||
if( longlongflag ) {
|
||||
fmtnum(value, 8, 0, ljust, len, zpad);
|
||||
break;
|
||||
case 'd':
|
||||
case 'D':
|
||||
if (longflag)
|
||||
{
|
||||
#ifdef HAVE_LONG_INT_64
|
||||
if (longlongflag)
|
||||
value = va_arg(args, long_long);
|
||||
} else {
|
||||
else
|
||||
#endif
|
||||
value = va_arg(args, long);
|
||||
}
|
||||
} else {
|
||||
else
|
||||
value = va_arg(args, int);
|
||||
}
|
||||
fmtnum( value, 10,1, ljust, len, zpad ); break;
|
||||
fmtnum(value, 10, 1, ljust, len, zpad);
|
||||
break;
|
||||
case 'x':
|
||||
if( longflag ){
|
||||
if (longflag)
|
||||
value = va_arg(args, long);
|
||||
} else {
|
||||
else
|
||||
value = va_arg(args, int);
|
||||
}
|
||||
fmtnum( value, 16,0, ljust, len, zpad ); break;
|
||||
fmtnum(value, 16, 0, ljust, len, zpad);
|
||||
break;
|
||||
case 'X':
|
||||
if( longflag ){
|
||||
if (longflag)
|
||||
value = va_arg(args, long);
|
||||
} else {
|
||||
else
|
||||
value = va_arg(args, int);
|
||||
}
|
||||
fmtnum( value,-16,0, ljust, len, zpad ); break;
|
||||
fmtnum(value, -16, 0, ljust, len, zpad);
|
||||
break;
|
||||
case 's':
|
||||
strvalue = va_arg(args, char *);
|
||||
if (maxwidth > 0 || !pointflag) {
|
||||
if (maxwidth > 0 || !pointflag)
|
||||
{
|
||||
if (pointflag && len > maxwidth)
|
||||
len = maxwidth; /* Adjust padding */
|
||||
fmtstr(strvalue, ljust, len, zpad, maxwidth);
|
||||
@ -227,8 +258,11 @@ dopr (char *buffer, const char *format, ... )
|
||||
break;
|
||||
case 'c':
|
||||
ch = va_arg(args, int);
|
||||
dopr_outch( ch ); break;
|
||||
case '%': dopr_outch( ch ); continue;
|
||||
dopr_outch(ch);
|
||||
break;
|
||||
case '%':
|
||||
dopr_outch(ch);
|
||||
continue;
|
||||
default:
|
||||
dostr("???????", 0);
|
||||
}
|
||||
@ -245,25 +279,32 @@ dopr (char *buffer, const char *format, ... )
|
||||
static void
|
||||
fmtstr(value, ljust, len, zpad, maxwidth)
|
||||
char *value;
|
||||
int ljust, len, zpad, maxwidth;
|
||||
int ljust,
|
||||
len,
|
||||
zpad,
|
||||
maxwidth;
|
||||
{
|
||||
int padlen, strlen; /* amount to pad */
|
||||
int padlen,
|
||||
strlen; /* amount to pad */
|
||||
|
||||
if( value == 0 ){
|
||||
if (value == 0)
|
||||
value = "<NULL>";
|
||||
}
|
||||
for (strlen = 0; value[strlen]; ++strlen); /* strlen */
|
||||
if (strlen > maxwidth && maxwidth)
|
||||
strlen = maxwidth;
|
||||
padlen = len - strlen;
|
||||
if( padlen < 0 ) padlen = 0;
|
||||
if( ljust ) padlen = -padlen;
|
||||
while( padlen > 0 ) {
|
||||
if (padlen < 0)
|
||||
padlen = 0;
|
||||
if (ljust)
|
||||
padlen = -padlen;
|
||||
while (padlen > 0)
|
||||
{
|
||||
dopr_outch(' ');
|
||||
--padlen;
|
||||
}
|
||||
dostr(value, maxwidth);
|
||||
while( padlen < 0 ) {
|
||||
while (padlen < 0)
|
||||
{
|
||||
dopr_outch(' ');
|
||||
++padlen;
|
||||
}
|
||||
@ -272,7 +313,11 @@ fmtstr( value, ljust, len, zpad, maxwidth )
|
||||
static void
|
||||
fmtnum(value, base, dosign, ljust, len, zpad)
|
||||
long value;
|
||||
int base, dosign, ljust, len, zpad;
|
||||
int base,
|
||||
dosign,
|
||||
ljust,
|
||||
len,
|
||||
zpad;
|
||||
{
|
||||
int signvalue = 0;
|
||||
unsigned long uvalue;
|
||||
@ -281,20 +326,26 @@ fmtnum( value, base, dosign, ljust, len, zpad )
|
||||
int padlen = 0; /* amount to pad */
|
||||
int caps = 0;
|
||||
|
||||
/* DEBUGP(("value 0x%x, base %d, dosign %d, ljust %d, len %d, zpad %d\n",
|
||||
value, base, dosign, ljust, len, zpad )); */
|
||||
/*
|
||||
* DEBUGP(("value 0x%x, base %d, dosign %d, ljust %d, len %d, zpad
|
||||
* %d\n", value, base, dosign, ljust, len, zpad ));
|
||||
*/
|
||||
uvalue = value;
|
||||
if( dosign ){
|
||||
if( value < 0 ) {
|
||||
if (dosign)
|
||||
{
|
||||
if (value < 0)
|
||||
{
|
||||
signvalue = '-';
|
||||
uvalue = -value;
|
||||
}
|
||||
}
|
||||
if( base < 0 ){
|
||||
if (base < 0)
|
||||
{
|
||||
caps = 1;
|
||||
base = -base;
|
||||
}
|
||||
do{
|
||||
do
|
||||
{
|
||||
convert[place++] =
|
||||
(caps ? "0123456789ABCDEF" : "0123456789abcdef")
|
||||
[uvalue % (unsigned) base];
|
||||
@ -302,28 +353,40 @@ fmtnum( value, base, dosign, ljust, len, zpad )
|
||||
} while (uvalue);
|
||||
convert[place] = 0;
|
||||
padlen = len - place;
|
||||
if( padlen < 0 ) padlen = 0;
|
||||
if( ljust ) padlen = -padlen;
|
||||
/* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n",
|
||||
convert,place,signvalue,padlen)); */
|
||||
if( zpad && padlen > 0 ){
|
||||
if( signvalue ){
|
||||
if (padlen < 0)
|
||||
padlen = 0;
|
||||
if (ljust)
|
||||
padlen = -padlen;
|
||||
|
||||
/*
|
||||
* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n",
|
||||
* convert,place,signvalue,padlen));
|
||||
*/
|
||||
if (zpad && padlen > 0)
|
||||
{
|
||||
if (signvalue)
|
||||
{
|
||||
dopr_outch(signvalue);
|
||||
--padlen;
|
||||
signvalue = 0;
|
||||
}
|
||||
while( padlen > 0 ){
|
||||
while (padlen > 0)
|
||||
{
|
||||
dopr_outch(zpad);
|
||||
--padlen;
|
||||
}
|
||||
}
|
||||
while( padlen > 0 ) {
|
||||
while (padlen > 0)
|
||||
{
|
||||
dopr_outch(' ');
|
||||
--padlen;
|
||||
}
|
||||
if( signvalue ) dopr_outch( signvalue );
|
||||
while( place > 0 ) dopr_outch( convert[--place] );
|
||||
while( padlen < 0 ){
|
||||
if (signvalue)
|
||||
dopr_outch(signvalue);
|
||||
while (place > 0)
|
||||
dopr_outch(convert[--place]);
|
||||
while (padlen < 0)
|
||||
{
|
||||
dopr_outch(' ');
|
||||
++padlen;
|
||||
}
|
||||
@ -334,10 +397,15 @@ dostr( str , cut)
|
||||
char *str;
|
||||
int cut;
|
||||
{
|
||||
if (cut) {
|
||||
while(*str && cut-- > 0) dopr_outch(*str++);
|
||||
} else {
|
||||
while(*str) dopr_outch(*str++);
|
||||
if (cut)
|
||||
{
|
||||
while (*str && cut-- > 0)
|
||||
dopr_outch(*str++);
|
||||
}
|
||||
else
|
||||
{
|
||||
while (*str)
|
||||
dopr_outch(*str++);
|
||||
}
|
||||
}
|
||||
|
||||
@ -346,7 +414,8 @@ dopr_outch( c )
|
||||
int c;
|
||||
{
|
||||
#if 0
|
||||
if( iscntrl(c) && c != '\n' && c != '\t' ){
|
||||
if (iscntrl(c) && c != '\n' && c != '\t')
|
||||
{
|
||||
c = '@' + (c & 0x1F);
|
||||
if (end == 0 || output < end)
|
||||
*output++ = '^';
|
||||
@ -357,5 +426,3 @@ dopr_outch( c )
|
||||
else
|
||||
SnprfOverflow++;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user