database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-11 05:41:32 +03:00
Code

Fix snprintf.c for machines that don't have long long, like some Irix.

Browse Source
This commit is contained in:
Bruce Momjian 1998-10-07 17:12:52 +00:00
parent 7d4b59f024
commit 9549a8cd7d
2 changed files with 310 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/commands/vacuum.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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); heap_close(rel);
/* update statistics in pg_class */ /* update statistics in pg_class */
vc_updstats(vacrelstats->relid, vacrelstats->num_pages, vacrelstats->num_tuples, vc_updstats(vacrelstats->relid, vacrelstats->num_pages,
vacrelstats->hasindex, vacrelstats); vacrelstats->num_tuples, vacrelstats->hasindex, vacrelstats);
/* next command frees attribute stats */ /* next command frees attribute stats */

217
src/backend/port/snprintf.c
View File

@ -49,7 +49,9 @@
#include <sys/param.h> #include <sys/param.h>
/* IRIX doesn't do 'long long' in va_arg(), so use a typedef */ /* IRIX doesn't do 'long long' in va_arg(), so use a typedef */
#ifdef HAVE_LONG_INT_64
typedef long long long_long; typedef long long long_long;
#endif
/* /*
** SNPRINTF, VSNPRINT -- counted versions of printf ** SNPRINTF, VSNPRINT -- counted versions of printf
@ -73,7 +75,7 @@ typedef long long long_long;
* causing nast effects. * 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 char *end;
static int SnprfOverflow; static int SnprfOverflow;
@ -85,6 +87,7 @@ int
snprintf(char *str, size_t count, const char *fmt,...) snprintf(char *str, size_t count, const char *fmt,...)
{ {
int len; int len;
VA_LOCAL_DECL VA_LOCAL_DECL
VA_START(fmt); VA_START(fmt);
@ -136,29 +139,42 @@ dopr (char *buffer, const char *format, ... )
int ljust; int ljust;
int len; int len;
int zpad; int zpad;
VA_LOCAL_DECL VA_LOCAL_DECL
VA_START(format); VA_START(format);
output = buffer; output = buffer;
while( (ch = *format++) ){ while ((ch = *format++))
switch( ch ){ {
switch (ch)
{
case '%': case '%':
ljust = len = zpad = maxwidth = 0; ljust = len = zpad = maxwidth = 0;
longflag = pointflag = 0; longflag = pointflag = 0;
nextch: nextch:
ch = *format++; ch = *format++;
switch( ch ){ switch (ch)
{
case 0: case 0:
dostr("**end of format**", 0); dostr("**end of format**", 0);
VA_END; VA_END;
return; return;
case '-': ljust = 1; goto nextch; case '-':
ljust = 1;
goto nextch;
case '0': /* set zero padding if len not set */ case '0': /* set zero padding if len not set */
if(len==0 && !pointflag) zpad = '0'; if (len == 0 && !pointflag)
case '1': case '2': case '3': zpad = '0';
case '4': case '5': case '6': case '1':
case '7': case '8': case '9': case '2':
case '3':
case '4':
case '5':
case '6':
case '7':
case '8':
case '9':
if (pointflag) if (pointflag)
maxwidth = maxwidth * 10 + ch - '0'; maxwidth = maxwidth * 10 + ch - '0';
else else
@ -170,56 +186,71 @@ dopr (char *buffer, const char *format, ... )
else else
len = va_arg(args, int); len = va_arg(args, int);
goto nextch; goto nextch;
case '.': pointflag = 1; goto nextch; case '.':
case 'l': if(longflag) { pointflag = 1;
longlongflag = 1; goto nextch; goto nextch;
} else { case 'l':
longflag = 1; goto nextch; 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) */ /* fmtnum(value,base,dosign,ljust,len,zpad) */
if( longflag ){ if (longflag)
value = va_arg(args, long); value = va_arg(args, long);
} else { else
value = va_arg(args, int); value = va_arg(args, int);
} fmtnum(value, 10, 0, ljust, len, zpad);
fmtnum( value, 10,0, ljust, len, zpad ); break; break;
case 'o': case 'O': case 'o':
case 'O':
/* fmtnum(value,base,dosign,ljust,len,zpad) */ /* fmtnum(value,base,dosign,ljust,len,zpad) */
if( longflag ){ if (longflag)
value = va_arg(args, long); value = va_arg(args, long);
} else { else
value = va_arg(args, int); value = va_arg(args, int);
} fmtnum(value, 8, 0, ljust, len, zpad);
fmtnum( value, 8,0, ljust, len, zpad ); break; break;
case 'd': case 'D': case 'd':
if( longflag ){ case 'D':
if( longlongflag ) { if (longflag)
{
#ifdef HAVE_LONG_INT_64
if (longlongflag)
value = va_arg(args, long_long); value = va_arg(args, long_long);
} else { else
#endif
value = va_arg(args, long); value = va_arg(args, long);
} }
} else { else
value = va_arg(args, int); value = va_arg(args, int);
} fmtnum(value, 10, 1, ljust, len, zpad);
fmtnum( value, 10,1, ljust, len, zpad ); break; break;
case 'x': case 'x':
if( longflag ){ if (longflag)
value = va_arg(args, long); value = va_arg(args, long);
} else { else
value = va_arg(args, int); value = va_arg(args, int);
} fmtnum(value, 16, 0, ljust, len, zpad);
fmtnum( value, 16,0, ljust, len, zpad ); break; break;
case 'X': case 'X':
if( longflag ){ if (longflag)
value = va_arg(args, long); value = va_arg(args, long);
} else { else
value = va_arg(args, int); value = va_arg(args, int);
} fmtnum(value, -16, 0, ljust, len, zpad);
fmtnum( value,-16,0, ljust, len, zpad ); break; break;
case 's': case 's':
strvalue = va_arg(args, char *); strvalue = va_arg(args, char *);
if (maxwidth > 0 || !pointflag) { if (maxwidth > 0 || !pointflag)
{
if (pointflag && len > maxwidth) if (pointflag && len > maxwidth)
len = maxwidth; /* Adjust padding */ len = maxwidth; /* Adjust padding */
fmtstr(strvalue, ljust, len, zpad, maxwidth); fmtstr(strvalue, ljust, len, zpad, maxwidth);
@ -227,8 +258,11 @@ dopr (char *buffer, const char *format, ... )
break; break;
case 'c': case 'c':
ch = va_arg(args, int); ch = va_arg(args, int);
dopr_outch( ch ); break; dopr_outch(ch);
case '%': dopr_outch( ch ); continue; break;
case '%':
dopr_outch(ch);
continue;
default: default:
dostr("???????", 0); dostr("???????", 0);
} }
@ -245,25 +279,32 @@ dopr (char *buffer, const char *format, ... )
static void static void
fmtstr(value, ljust, len, zpad, maxwidth) fmtstr(value, ljust, len, zpad, maxwidth)
char *value; 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>"; value = "<NULL>";
}
for (strlen = 0; value[strlen]; ++strlen); /* strlen */ for (strlen = 0; value[strlen]; ++strlen); /* strlen */
if (strlen > maxwidth && maxwidth) if (strlen > maxwidth && maxwidth)
strlen = maxwidth; strlen = maxwidth;
padlen = len - strlen; padlen = len - strlen;
if( padlen < 0 ) padlen = 0; if (padlen < 0)
if( ljust ) padlen = -padlen; padlen = 0;
while( padlen > 0 ) { if (ljust)
padlen = -padlen;
while (padlen > 0)
{
dopr_outch(' '); dopr_outch(' ');
--padlen; --padlen;
} }
dostr(value, maxwidth); dostr(value, maxwidth);
while( padlen < 0 ) { while (padlen < 0)
{
dopr_outch(' '); dopr_outch(' ');
++padlen; ++padlen;
} }
@ -272,7 +313,11 @@ fmtstr( value, ljust, len, zpad, maxwidth )
static void static void
fmtnum(value, base, dosign, ljust, len, zpad) fmtnum(value, base, dosign, ljust, len, zpad)
long value; long value;
int base, dosign, ljust, len, zpad; int base,
dosign,
ljust,
len,
zpad;
{ {
int signvalue = 0; int signvalue = 0;
unsigned long uvalue; unsigned long uvalue;
@ -281,20 +326,26 @@ fmtnum( value, base, dosign, ljust, len, zpad )
int padlen = 0; /* amount to pad */ int padlen = 0; /* amount to pad */
int caps = 0; 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; uvalue = value;
if( dosign ){ if (dosign)
if( value < 0 ) { {
if (value < 0)
{
signvalue = '-'; signvalue = '-';
uvalue = -value; uvalue = -value;
} }
} }
if( base < 0 ){ if (base < 0)
{
caps = 1; caps = 1;
base = -base; base = -base;
} }
do{ do
{
convert[place++] = convert[place++] =
(caps ? "0123456789ABCDEF" : "0123456789abcdef") (caps ? "0123456789ABCDEF" : "0123456789abcdef")
[uvalue % (unsigned) base]; [uvalue % (unsigned) base];
@ -302,28 +353,40 @@ fmtnum( value, base, dosign, ljust, len, zpad )
} while (uvalue); } while (uvalue);
convert[place] = 0; convert[place] = 0;
padlen = len - place; padlen = len - place;
if( padlen < 0 ) padlen = 0; if (padlen < 0)
if( ljust ) padlen = -padlen; padlen = 0;
/* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n", if (ljust)
convert,place,signvalue,padlen)); */ padlen = -padlen;
if( zpad && padlen > 0 ){
if( signvalue ){ /*
* DEBUGP(( "str '%s', place %d, sign %c, padlen %d\n",
* convert,place,signvalue,padlen));
*/
if (zpad && padlen > 0)
{
if (signvalue)
{
dopr_outch(signvalue); dopr_outch(signvalue);
--padlen; --padlen;
signvalue = 0; signvalue = 0;
} }
while( padlen > 0 ){ while (padlen > 0)
{
dopr_outch(zpad); dopr_outch(zpad);
--padlen; --padlen;
} }
} }
while( padlen > 0 ) { while (padlen > 0)
{
dopr_outch(' '); dopr_outch(' ');
--padlen; --padlen;
} }
if( signvalue ) dopr_outch( signvalue ); if (signvalue)
while( place > 0 ) dopr_outch( convert[--place] ); dopr_outch(signvalue);
while( padlen < 0 ){ while (place > 0)
dopr_outch(convert[--place]);
while (padlen < 0)
{
dopr_outch(' '); dopr_outch(' ');
++padlen; ++padlen;
} }
@ -334,10 +397,15 @@ dostr( str , cut)
char *str; char *str;
int cut; int cut;
{ {
if (cut) { if (cut)
while(*str && cut-- > 0) dopr_outch(*str++); {
} else { while (*str && cut-- > 0)
while(*str) dopr_outch(*str++); dopr_outch(*str++);
}
else
{
while (*str)
dopr_outch(*str++);
} }
} }
@ -346,7 +414,8 @@ dopr_outch( c )
int c; int c;
{ {
#if 0 #if 0
if( iscntrl(c) && c != '\n' && c != '\t' ){ if (iscntrl(c) && c != '\n' && c != '\t')
{
c = '@' + (c & 0x1F); c = '@' + (c & 0x1F);
if (end == 0 || output < end) if (end == 0 || output < end)
*output++ = '^'; *output++ = '^';
@ -357,5 +426,3 @@ dopr_outch( c )
else else
SnprfOverflow++; SnprfOverflow++;
} }