[syslog-ng] syslog-ng under HP-UX 10.20
Balazs Scheidler
bazsi@balabit.hu
Fri, 24 Mar 2000 12:04:06 +0100
--eAbsdosE1cNLO4uF
Content-Type: multipart/mixed; boundary="J/dobhs11T7y2rNN"
--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: quoted-printable
> On Fri, 24 Mar 2000, Klaus Groenhoej wrote:
>=20
> > I'm getting a warning when i'm compiling syslog-ng:
> [snip]
> > Making all in src
> > Reading specs from /opt/gcc/lib/gcc-lib/hppa1.1-hp-hpux10.20/2.95.2/spe=
cs
> > gcc version 2.95.2 19991024 (release)
>=20
> Ok, I'm just compiling gcc-2.95.2. Then I will compare the results and we
> can perhaps find out what's wrong with my installation.=20
Attached you'll find a patch against 1.4.2 to support systems without
snprintf(), you'll need autoconf & automake to regenerate the configuration
script & Makefiles.
--=20
Bazsi
PGP info: KeyID 9AF8D0A9 Fingerprint CD27 CFB0 802C 0944 9CFD 804E C82C 8EB1
url: http://www.balabit.hu/pgpkey.txt
--J/dobhs11T7y2rNN
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename=aaa
Content-Transfer-Encoding: quoted-printable
diff -urN syslog-ng-1.4.2/ChangeLog syslog-ng-1.4.3/ChangeLog
--- syslog-ng-1.4.2/ChangeLog Mon Mar 13 15:11:05 2000
+++ syslog-ng-1.4.3/ChangeLog Fri Mar 24 11:57:20 2000
@@ -1,3 +1,9 @@
+2000-03-24 Balazs Scheidler <bazsi@balabit.hu>
+
+ * configure.in: added check for snprintf, vsnprintf
+
+ * src/Makefile.am: snprintf.c added to EXTRA_DIST
+
2000-03-13 Balazs Scheidler <bazsi@balabit.hu>
=20
* cfg-grammar.y: added support for keep_hostname()
diff -urN syslog-ng-1.4.2/configure.in syslog-ng-1.4.3/configure.in
--- syslog-ng-1.4.2/configure.in Mon Mar 13 15:13:07 2000
+++ syslog-ng-1.4.3/configure.in Fri Mar 24 11:59:31 2000
@@ -96,9 +96,14 @@
AC_FUNC_ALLOCA
AC_FUNC_VPRINTF
AC_CHECK_LIB(door, door_create)
-AC_CHECK_FUNCS(select vsnprintf strerror inet_aton strncpy getutent)
-AC_CHECK_FUNC(getopt_long,,[LIBOBJS=3D"getopt.c getopt1.c $LIBOBJS"])
-AC_CHECK_FUNC(strcasecmp,,[LIBOBJS=3D"strcasecmp.c $LIBOBJS"])
+AC_CHECK_FUNCS(select snprintf vsnprintf strerror inet_aton strncpy getute=
nt)
+AC_CHECK_FUNC(getopt_long,,[LIBOBJS=3D"getopt.o getopt1.o $LIBOBJS"])
+AC_CHECK_FUNC(strcasecmp,,[LIBOBJS=3D"strcasecmp.o $LIBOBJS"])
+
+if test "x$ac_cv_func_snprintf" =3D "xno" -o \
+ "x$ac_cv_func_vsnprintf" =3D "xno"; then
+ LIBOBJS=3D"snprintf.o $LIBOBJS"
+fi
=20
if test "x$ac_cv_lib_door_door_create" =3D "xyes"; then
AC_CHECK_HEADERS(pthread.h)
diff -urN syslog-ng-1.4.2/src/Makefile.am syslog-ng-1.4.3/src/Makefile.am
--- syslog-ng-1.4.2/src/Makefile.am Tue Feb 22 18:50:29 2000
+++ syslog-ng-1.4.3/src/Makefile.am Fri Mar 24 11:57:28 2000
@@ -1,5 +1,5 @@
## Run automake to produce Makefile.in
-## $Id: Makefile.am,v 1.37 2000/02/22 17:50:29 bazsi Exp $
+## $Id: Makefile.am,v 1.37.2.1 2000/03/24 10:57:28 bazsi Exp $
=20
YFLAGS =3D @YFLAGS@
MAKE_CLASS =3D @MAKE_CLASS@
@@ -70,7 +70,7 @@
=20
EXTRA_DIST =3D $(dist_x_files) $(dist_h_files) \
getopt.c getopt.h getopt1.c strcasecmp.c \
- cfg-grammar.h
+ cfg-grammar.h snprintf.c
=20
cfg-lex.l: cfg-grammar.h
=20
diff -urN syslog-ng-1.4.2/src/snprintf.c syslog-ng-1.4.3/src/snprintf.c
--- syslog-ng-1.4.2/src/snprintf.c Thu Jan 1 01:00:00 1970
+++ syslog-ng-1.4.3/src/snprintf.c Fri Mar 24 11:46:52 2000
@@ -0,0 +1,811 @@
+/*
+ * Copyright Patrick Powell 1995
+ * This code is based on code written by Patrick Powell (papowell@astart.c=
om)
+ * It may be used for any purpose as long as this notice remains intact
+ * on all source code distributions
+ */
+
+/**************************************************************
+ * Original:
+ * Patrick Powell Tue Apr 11 09:48:21 PDT 1995
+ * A bombproof version of doprnt (dopr) included.
+ * Sigh. This sort of thing is always nasty do deal with. Note that
+ * the version here does not include floating point...
+ *
+ * snprintf() is used instead of sprintf() as it does limit checks
+ * for string length. This covers a nasty loophole.
+ *
+ * The other functions are there to prevent NULL pointers from
+ * causing nast effects.
+ *
+ * More Recently:
+ * Brandon Long <blong@fiction.net> 9/15/96 for mutt 0.43
+ * This was ugly. It is still ugly. I opted out of floating point
+ * numbers, but the formatter understands just about everything
+ * from the normal C string format, at least as far as I can tell from
+ * the Solaris 2.5 printf(3S) man page.
+ *
+ * Brandon Long <blong@fiction.net> 10/22/97 for mutt 0.87.1
+ * Ok, added some minimal floating point support, which means this
+ * probably requires libm on most operating systems. Don't yet
+ * support the exponent (e,E) and sigfig (g,G). Also, fmtint()
+ * was pretty badly broken, it just wasn't being exercised in ways
+ * which showed it, so that's been fixed. Also, formated the code
+ * to mutt conventions, and removed dead code left over from the
+ * original. Also, there is now a builtin-test, just compile with:
+ * gcc -DTEST_SNPRINTF -o snprintf snprintf.c -lm
+ * and run snprintf for results.
+ *=20
+ * Thomas Roessler <roessler@guug.de> 01/27/98 for mutt 0.89i
+ * The PGP code was using unsigned hexadecimal formats.=20
+ * Unfortunately, unsigned formats simply didn't work.
+ *
+ * Michael Elkins <me@cs.hmc.edu> 03/05/98 for mutt 0.90.8
+ * The original code assumed that both snprintf() and vsnprintf() were
+ * missing. Some systems only have snprintf() but not vsnprintf(), so
+ * the code is now broken down under HAVE_SNPRINTF and HAVE_VSNPRINTF.
+ *
+ * Andrew Tridgell (tridge@samba.org) Oct 1998
+ * fixed handling of %.0f
+ * added test for HAVE_LONG_DOUBLE
+ *
+ **************************************************************/
+
+#include "config.h"
+
+#if !defined(HAVE_SNPRINTF) || !defined(HAVE_VSNPRINTF)
+
+#include <string.h>
+#include <ctype.h>
+#include <sys/types.h>
+
+/* Define this as a fall through, HAVE_STDARG_H is probably already set */
+
+#define HAVE_VARARGS_H
+
+
+/* varargs declarations: */
+
+#if defined(HAVE_STDARG_H)
+# include <stdarg.h>
+# define HAVE_STDARGS /* let's hope that works everywhere (mj) */
+# define VA_LOCAL_DECL va_list ap
+# define VA_START(f) va_start(ap, f)
+# define VA_SHIFT(v,t) ; /* no-op for ANSI */
+# define VA_END va_end(ap)
+#else
+# if defined(HAVE_VARARGS_H)
+# include <varargs.h>
+# undef HAVE_STDARGS
+# define VA_LOCAL_DECL va_list ap
+# define VA_START(f) va_start(ap) /* f is ignored! */
+# define VA_SHIFT(v,t) v =3D va_arg(ap,t)
+# define VA_END va_end(ap)
+# else
+/*XX ** NO VARARGS ** XX*/
+# endif
+#endif
+
+#ifdef HAVE_LONG_DOUBLE
+#define LDOUBLE long double
+#else
+#define LDOUBLE double
+#endif
+
+int snprintf (char *str, size_t count, const char *fmt, ...);
+int vsnprintf (char *str, size_t count, const char *fmt, va_list arg);
+
+static void dopr (char *buffer, size_t maxlen, const char *format,=20
+ va_list args);
+static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
+ char *value, int flags, int min, int max);
+static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
+ long value, int base, int min, int max, int flags);
+static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
+ LDOUBLE fvalue, int min, int max, int flags);
+static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char=
c );
+
+/*
+ * dopr(): poor man's version of doprintf
+ */
+
+/* format read states */
+#define DP_S_DEFAULT 0
+#define DP_S_FLAGS 1
+#define DP_S_MIN 2
+#define DP_S_DOT 3
+#define DP_S_MAX 4
+#define DP_S_MOD 5
+#define DP_S_CONV 6
+#define DP_S_DONE 7
+
+/* format flags - Bits */
+#define DP_F_MINUS (1 << 0)
+#define DP_F_PLUS (1 << 1)
+#define DP_F_SPACE (1 << 2)
+#define DP_F_NUM (1 << 3)
+#define DP_F_ZERO (1 << 4)
+#define DP_F_UP (1 << 5)
+#define DP_F_UNSIGNED (1 << 6)
+
+/* Conversion Flags */
+#define DP_C_SHORT 1
+#define DP_C_LONG 2
+#define DP_C_LDOUBLE 3
+
+#define char_to_int(p) (p - '0')
+#define MAX(p,q) ((p >=3D q) ? p : q)
+
+static void dopr (char *buffer, size_t maxlen, const char *format, va_list=
args)
+{
+ char ch;
+ long value;
+ LDOUBLE fvalue;
+ char *strvalue;
+ int min;
+ int max;
+ int state;
+ int flags;
+ int cflags;
+ size_t currlen;
+ =20
+ state =3D DP_S_DEFAULT;
+ currlen =3D flags =3D cflags =3D min =3D 0;
+ max =3D -1;
+ ch =3D *format++;
+
+ while (state !=3D DP_S_DONE)
+ {
+ if ((ch =3D=3D '\0') || (currlen >=3D maxlen))=20
+ state =3D DP_S_DONE;
+
+ switch(state)=20
+ {
+ case DP_S_DEFAULT:
+ if (ch =3D=3D '%')=20
+ state =3D DP_S_FLAGS;
+ else=20
+ dopr_outch (buffer, &currlen, maxlen, ch);
+ ch =3D *format++;
+ break;
+ case DP_S_FLAGS:
+ switch (ch)=20
+ {
+ case '-':
+ flags |=3D DP_F_MINUS;
+ ch =3D *format++;
+ break;
+ case '+':
+ flags |=3D DP_F_PLUS;
+ ch =3D *format++;
+ break;
+ case ' ':
+ flags |=3D DP_F_SPACE;
+ ch =3D *format++;
+ break;
+ case '#':
+ flags |=3D DP_F_NUM;
+ ch =3D *format++;
+ break;
+ case '0':
+ flags |=3D DP_F_ZERO;
+ ch =3D *format++;
+ break;
+ default:
+ state =3D DP_S_MIN;
+ break;
+ }
+ break;
+ case DP_S_MIN:
+ if (isdigit(ch))=20
+ {
+ min =3D 10*min + char_to_int (ch);
+ ch =3D *format++;
+ }=20
+ else if (ch =3D=3D '*')=20
+ {
+ min =3D va_arg (args, int);
+ ch =3D *format++;
+ state =3D DP_S_DOT;
+ }=20
+ else=20
+ state =3D DP_S_DOT;
+ break;
+ case DP_S_DOT:
+ if (ch =3D=3D '.')=20
+ {
+ state =3D DP_S_MAX;
+ ch =3D *format++;
+ }=20
+ else=20
+ state =3D DP_S_MOD;
+ break;
+ case DP_S_MAX:
+ if (isdigit(ch))=20
+ {
+ if (max < 0)
+ max =3D 0;
+ max =3D 10*max + char_to_int (ch);
+ ch =3D *format++;
+ }=20
+ else if (ch =3D=3D '*')=20
+ {
+ max =3D va_arg (args, int);
+ ch =3D *format++;
+ state =3D DP_S_MOD;
+ }=20
+ else=20
+ state =3D DP_S_MOD;
+ break;
+ case DP_S_MOD:
+ /* Currently, we don't support Long Long, bummer */
+ switch (ch)=20
+ {
+ case 'h':
+ cflags =3D DP_C_SHORT;
+ ch =3D *format++;
+ break;
+ case 'l':
+ cflags =3D DP_C_LONG;
+ ch =3D *format++;
+ break;
+ case 'L':
+ cflags =3D DP_C_LDOUBLE;
+ ch =3D *format++;
+ break;
+ default:
+ break;
+ }
+ state =3D DP_S_CONV;
+ break;
+ case DP_S_CONV:
+ switch (ch)=20
+ {
+ case 'd':
+ case 'i':
+ if (cflags =3D=3D DP_C_SHORT)=20
+ value =3D va_arg (args, short int);
+ else if (cflags =3D=3D DP_C_LONG)
+ value =3D va_arg (args, long int);
+ else
+ value =3D va_arg (args, int);
+ fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
+ break;
+ case 'o':
+ flags |=3D DP_F_UNSIGNED;
+ if (cflags =3D=3D DP_C_SHORT)
+ value =3D va_arg (args, unsigned short int);
+ else if (cflags =3D=3D DP_C_LONG)
+ value =3D va_arg (args, unsigned long int);
+ else
+ value =3D va_arg (args, unsigned int);
+ fmtint (buffer, &currlen, maxlen, value, 8, min, max, flags);
+ break;
+ case 'u':
+ flags |=3D DP_F_UNSIGNED;
+ if (cflags =3D=3D DP_C_SHORT)
+ value =3D va_arg (args, unsigned short int);
+ else if (cflags =3D=3D DP_C_LONG)
+ value =3D va_arg (args, unsigned long int);
+ else
+ value =3D va_arg (args, unsigned int);
+ fmtint (buffer, &currlen, maxlen, value, 10, min, max, flags);
+ break;
+ case 'X':
+ flags |=3D DP_F_UP;
+ case 'x':
+ flags |=3D DP_F_UNSIGNED;
+ if (cflags =3D=3D DP_C_SHORT)
+ value =3D va_arg (args, unsigned short int);
+ else if (cflags =3D=3D DP_C_LONG)
+ value =3D va_arg (args, unsigned long int);
+ else
+ value =3D va_arg (args, unsigned int);
+ fmtint (buffer, &currlen, maxlen, value, 16, min, max, flags);
+ break;
+ case 'f':
+ if (cflags =3D=3D DP_C_LDOUBLE)
+ fvalue =3D va_arg (args, LDOUBLE);
+ else
+ fvalue =3D va_arg (args, double);
+ /* um, floating point? */
+ fmtfp (buffer, &currlen, maxlen, fvalue, min, max, flags);
+ break;
+ case 'E':
+ flags |=3D DP_F_UP;
+ case 'e':
+ if (cflags =3D=3D DP_C_LDOUBLE)
+ fvalue =3D va_arg (args, LDOUBLE);
+ else
+ fvalue =3D va_arg (args, double);
+ break;
+ case 'G':
+ flags |=3D DP_F_UP;
+ case 'g':
+ if (cflags =3D=3D DP_C_LDOUBLE)
+ fvalue =3D va_arg (args, LDOUBLE);
+ else
+ fvalue =3D va_arg (args, double);
+ break;
+ case 'c':
+ dopr_outch (buffer, &currlen, maxlen, va_arg (args, int));
+ break;
+ case 's':
+ strvalue =3D va_arg (args, char *);
+ if (max < 0)=20
+ max =3D maxlen; /* ie, no max */
+ fmtstr (buffer, &currlen, maxlen, strvalue, flags, min, max);
+ break;
+ case 'p':
+ strvalue =3D va_arg (args, void *);
+ fmtint (buffer, &currlen, maxlen, (long) strvalue, 16, min, max, flags);
+ break;
+ case 'n':
+ if (cflags =3D=3D DP_C_SHORT)=20
+ {
+ short int *num;
+ num =3D va_arg (args, short int *);
+ *num =3D currlen;
+ }=20
+ else if (cflags =3D=3D DP_C_LONG)=20
+ {
+ long int *num;
+ num =3D va_arg (args, long int *);
+ *num =3D currlen;
+ }=20
+ else=20
+ {
+ int *num;
+ num =3D va_arg (args, int *);
+ *num =3D currlen;
+ }
+ break;
+ case '%':
+ dopr_outch (buffer, &currlen, maxlen, ch);
+ break;
+ case 'w':
+ /* not supported yet, treat as next char */
+ ch =3D *format++;
+ break;
+ default:
+ /* Unknown, skip */
+ break;
+ }
+ ch =3D *format++;
+ state =3D DP_S_DEFAULT;
+ flags =3D cflags =3D min =3D 0;
+ max =3D -1;
+ break;
+ case DP_S_DONE:
+ break;
+ default:
+ /* hmm? */
+ break; /* some picky compilers need this */
+ }
+ }
+ if (currlen < maxlen - 1)=20
+ buffer[currlen] =3D '\0';
+ else=20
+ buffer[maxlen - 1] =3D '\0';
+}
+
+static void fmtstr (char *buffer, size_t *currlen, size_t maxlen,
+ char *value, int flags, int min, int max)
+{
+ int padlen, strln; /* amount to pad */
+ int cnt =3D 0;
+ =20
+ if (value =3D=3D 0)
+ {
+ value =3D "<NULL>";
+ }
+
+ for (strln =3D 0; value[strln]; ++strln); /* strlen */
+ padlen =3D min - strln;
+ if (padlen < 0)=20
+ padlen =3D 0;
+ if (flags & DP_F_MINUS)=20
+ padlen =3D -padlen; /* Left Justify */
+
+ while ((padlen > 0) && (cnt < max))=20
+ {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ --padlen;
+ ++cnt;
+ }
+ while (*value && (cnt < max))=20
+ {
+ dopr_outch (buffer, currlen, maxlen, *value++);
+ ++cnt;
+ }
+ while ((padlen < 0) && (cnt < max))=20
+ {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ ++padlen;
+ ++cnt;
+ }
+}
+
+/* Have to handle DP_F_NUM (ie 0x and 0 alternates) */
+
+static void fmtint (char *buffer, size_t *currlen, size_t maxlen,
+ long value, int base, int min, int max, int flags)
+{
+ int signvalue =3D 0;
+ unsigned long uvalue;
+ char convert[20];
+ int place =3D 0;
+ int spadlen =3D 0; /* amount to space pad */
+ int zpadlen =3D 0; /* amount to zero pad */
+ int caps =3D 0;
+ =20
+ if (max < 0)
+ max =3D 0;
+
+ uvalue =3D value;
+
+ if(!(flags & DP_F_UNSIGNED))
+ {
+ if( value < 0 ) {
+ signvalue =3D '-';
+ uvalue =3D -value;
+ }
+ else
+ if (flags & DP_F_PLUS) /* Do a sign (+/i) */
+ signvalue =3D '+';
+ else
+ if (flags & DP_F_SPACE)
+ signvalue =3D ' ';
+ }
+ =20
+ if (flags & DP_F_UP) caps =3D 1; /* Should characters be upper case? */
+
+ do {
+ convert[place++] =3D
+ (caps? "0123456789ABCDEF":"0123456789abcdef")
+ [uvalue % (unsigned)base ];
+ uvalue =3D (uvalue / (unsigned)base );
+ } while(uvalue && (place < 20));
+ if (place =3D=3D 20) place--;
+ convert[place] =3D 0;
+
+ zpadlen =3D max - place;
+ spadlen =3D min - MAX (max, place) - (signvalue ? 1 : 0);
+ if (zpadlen < 0) zpadlen =3D 0;
+ if (spadlen < 0) spadlen =3D 0;
+ if (flags & DP_F_ZERO)
+ {
+ zpadlen =3D MAX(zpadlen, spadlen);
+ spadlen =3D 0;
+ }
+ if (flags & DP_F_MINUS)=20
+ spadlen =3D -spadlen; /* Left Justifty */
+
+#ifdef DEBUG_SNPRINTF
+ dprint (1, (debugfile, "zpad: %d, spad: %d, min: %d, max: %d, place: %d\=
n",
+ zpadlen, spadlen, min, max, place));
+#endif
+
+ /* Spaces */
+ while (spadlen > 0)=20
+ {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ --spadlen;
+ }
+
+ /* Sign */
+ if (signvalue)=20
+ dopr_outch (buffer, currlen, maxlen, signvalue);
+
+ /* Zeros */
+ if (zpadlen > 0)=20
+ {
+ while (zpadlen > 0)
+ {
+ dopr_outch (buffer, currlen, maxlen, '0');
+ --zpadlen;
+ }
+ }
+
+ /* Digits */
+ while (place > 0)=20
+ dopr_outch (buffer, currlen, maxlen, convert[--place]);
+ =20
+ /* Left Justified spaces */
+ while (spadlen < 0) {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ ++spadlen;
+ }
+}
+
+static LDOUBLE abs_val (LDOUBLE value)
+{
+ LDOUBLE result =3D value;
+
+ if (value < 0)
+ result =3D -value;
+
+ return result;
+}
+
+static LDOUBLE pow10 (int exp)
+{
+ LDOUBLE result =3D 1;
+
+ while (exp)
+ {
+ result *=3D 10;
+ exp--;
+ }
+ =20
+ return result;
+}
+
+static long round (LDOUBLE value)
+{
+ long intpart;
+
+ intpart =3D value;
+ value =3D value - intpart;
+ if (value >=3D 0.5)
+ intpart++;
+
+ return intpart;
+}
+
+static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
+ LDOUBLE fvalue, int min, int max, int flags)
+{
+ int signvalue =3D 0;
+ LDOUBLE ufvalue;
+ char iconvert[20];
+ char fconvert[20];
+ int iplace =3D 0;
+ int fplace =3D 0;
+ int padlen =3D 0; /* amount to pad */
+ int zpadlen =3D 0;=20
+ int caps =3D 0;
+ long intpart;
+ long fracpart;
+ =20
+ /*=20
+ * AIX manpage says the default is 0, but Solaris says the default
+ * is 6, and sprintf on AIX defaults to 6
+ */
+ if (max < 0)
+ max =3D 6;
+
+ ufvalue =3D abs_val (fvalue);
+
+ if (fvalue < 0)
+ signvalue =3D '-';
+ else
+ if (flags & DP_F_PLUS) /* Do a sign (+/i) */
+ signvalue =3D '+';
+ else
+ if (flags & DP_F_SPACE)
+ signvalue =3D ' ';
+
+#if 0
+ if (flags & DP_F_UP) caps =3D 1; /* Should characters be upper case? */
+#endif
+
+ intpart =3D ufvalue;
+
+ /*=20
+ * Sorry, we only support 9 digits past the decimal because of our=20
+ * conversion method
+ */
+ if (max > 9)
+ max =3D 9;
+
+ /* We "cheat" by converting the fractional part to integer by
+ * multiplying by a factor of 10
+ */
+ fracpart =3D round ((pow10 (max)) * (ufvalue - intpart));
+
+ if (fracpart >=3D pow10 (max))
+ {
+ intpart++;
+ fracpart -=3D pow10 (max);
+ }
+
+#ifdef DEBUG_SNPRINTF
+ dprint (1, (debugfile, "fmtfp: %f =3D? %d.%d\n", fvalue, intpart, fracpa=
rt));
+#endif
+
+ /* Convert integer part */
+ do {
+ iconvert[iplace++] =3D
+ (caps? "0123456789ABCDEF":"0123456789abcdef")[intpart % 10];
+ intpart =3D (intpart / 10);
+ } while(intpart && (iplace < 20));
+ if (iplace =3D=3D 20) iplace--;
+ iconvert[iplace] =3D 0;
+
+ /* Convert fractional part */
+ do {
+ fconvert[fplace++] =3D
+ (caps? "0123456789ABCDEF":"0123456789abcdef")[fracpart % 10];
+ fracpart =3D (fracpart / 10);
+ } while(fracpart && (fplace < 20));
+ if (fplace =3D=3D 20) fplace--;
+ fconvert[fplace] =3D 0;
+
+ /* -1 for decimal point, another -1 if we are printing a sign */
+ padlen =3D min - iplace - max - 1 - ((signvalue) ? 1 : 0);=20
+ zpadlen =3D max - fplace;
+ if (zpadlen < 0)
+ zpadlen =3D 0;
+ if (padlen < 0)=20
+ padlen =3D 0;
+ if (flags & DP_F_MINUS)=20
+ padlen =3D -padlen; /* Left Justifty */
+
+ if ((flags & DP_F_ZERO) && (padlen > 0))=20
+ {
+ if (signvalue)=20
+ {
+ dopr_outch (buffer, currlen, maxlen, signvalue);
+ --padlen;
+ signvalue =3D 0;
+ }
+ while (padlen > 0)
+ {
+ dopr_outch (buffer, currlen, maxlen, '0');
+ --padlen;
+ }
+ }
+ while (padlen > 0)
+ {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ --padlen;
+ }
+ if (signvalue)=20
+ dopr_outch (buffer, currlen, maxlen, signvalue);
+
+ while (iplace > 0)=20
+ dopr_outch (buffer, currlen, maxlen, iconvert[--iplace]);
+
+ /*
+ * Decimal point. This should probably use locale to find the correct
+ * char to print out.
+ */
+ if (max > 0)
+ {
+ dopr_outch (buffer, currlen, maxlen, '.');
+
+ while (fplace > 0)=20
+ dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
+ }
+
+ while (zpadlen > 0)
+ {
+ dopr_outch (buffer, currlen, maxlen, '0');
+ --zpadlen;
+ }
+
+ while (padlen < 0)=20
+ {
+ dopr_outch (buffer, currlen, maxlen, ' ');
+ ++padlen;
+ }
+}
+
+static void dopr_outch (char *buffer, size_t *currlen, size_t maxlen, char=
c)
+{
+ if (*currlen < maxlen)
+ buffer[(*currlen)++] =3D c;
+}
+
+#ifndef HAVE_VSNPRINTF
+int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+{
+ str[0] =3D 0;
+ dopr(str, count, fmt, args);
+ return(strlen(str));
+}
+#endif /* !HAVE_VSNPRINTF */
+
+#ifndef HAVE_SNPRINTF
+/* VARARGS3 */
+#ifdef HAVE_STDARGS
+int snprintf (char *str,size_t count,const char *fmt,...)
+#else
+int snprintf (va_alist) va_dcl
+#endif
+{
+#ifndef HAVE_STDARGS
+ char *str;
+ size_t count;
+ char *fmt;
+#endif
+ VA_LOCAL_DECL;
+ =20
+ VA_START (fmt);
+ VA_SHIFT (str, char *);
+ VA_SHIFT (count, size_t );
+ VA_SHIFT (fmt, char *);
+ (void) vsnprintf(str, count, fmt, ap);
+ VA_END;
+ return(strlen(str));
+}
+#endif /* !HAVE_SNPRINTF */
+
+#ifdef TEST_SNPRINTF
+#ifndef LONG_STRING
+#define LONG_STRING 1024
+#endif
+int main (void)
+{
+ char buf1[LONG_STRING];
+ char buf2[LONG_STRING];
+ char *fp_fmt[] =3D {
+ "%-1.5f",
+ "%1.5f",
+ "%123.9f",
+ "%10.5f",
+ "% 10.5f",
+ "%+22.9f",
+ "%+4.9f",
+ "%01.3f",
+ "%4f",
+ "%3.1f",
+ "%3.2f",
+ "%.0f",
+ "%.1f",
+ NULL
+ };
+ double fp_nums[] =3D { -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.=
996,=20
+ 0.9996, 1.996, 4.136, 0};
+ char *int_fmt[] =3D {
+ "%-1.5d",
+ "%1.5d",
+ "%123.9d",
+ "%5.5d",
+ "%10.5d",
+ "% 10.5d",
+ "%+22.33d",
+ "%01.3d",
+ "%4d",
+ NULL
+ };
+ long int_nums[] =3D { -1, 134, 91340, 341, 0203, 0};
+ int x, y;
+ int fail =3D 0;
+ int num =3D 0;
+
+ printf ("Testing snprintf format codes against system sprintf...\n");
+
+ for (x =3D 0; fp_fmt[x] !=3D NULL ; x++)
+ for (y =3D 0; fp_nums[y] !=3D 0 ; y++)
+ {
+ snprintf (buf1, sizeof (buf1), fp_fmt[x], fp_nums[y]);
+ sprintf (buf2, fp_fmt[x], fp_nums[y]);
+ if (strcmp (buf1, buf2))
+ {
+ printf("snprintf doesn't match Format: %s\n\tsnprintf =3D %s\n\tsprintf =
=3D %s\n",=20
+ fp_fmt[x], buf1, buf2);
+ fail++;
+ }
+ num++;
+ }
+
+ for (x =3D 0; int_fmt[x] !=3D NULL ; x++)
+ for (y =3D 0; int_nums[y] !=3D 0 ; y++)
+ {
+ snprintf (buf1, sizeof (buf1), int_fmt[x], int_nums[y]);
+ sprintf (buf2, int_fmt[x], int_nums[y]);
+ if (strcmp (buf1, buf2))
+ {
+ printf("snprintf doesn't match Format: %s\n\tsnprintf =3D %s\n\tsprintf =
=3D %s\n",=20
+ int_fmt[x], buf1, buf2);
+ fail++;
+ }
+ num++;
+ }
+ printf ("%d tests failed out of %d.\n", fail, num);
+}
+#endif /* SNPRINTF_TEST */
+
+#endif /* !HAVE_SNPRINTF */
--J/dobhs11T7y2rNN--
--eAbsdosE1cNLO4uF
Content-Type: application/pgp-signature
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.1 (GNU/Linux)
Comment: For info see http://www.gnupg.org
iQEVAwUBONtLosGXIGCa+NCpAQGtvQf/bAE/MiK7tBjXCrUPEnn9BsufIUzBy2VP
gUSMHJbc4PXsppJgA8B3kmK94UuidBPVluFXNmDuXqx7rFDeAz2HglwBz++YZL3C
Vk0KKfRSKZeRSJH6OoXyMGLnw5DxahNEFT5LuOVKR5tipwWqEQPmmbrd+Qe8ehRw
y/vwNcaZ8bcpXhCKyb3XkbFqYsgBi+L8+pi/0xyLjh8IfU3wGJqzQrzh/wS2Wvs2
+RHZNF0apKHfrY8YuJN+Vrh5E3ZZ45/Z7kkZhNZh+2NsW2E05r6dtkWtmbZ2STsb
ItvH+Syp6yjVar08pqYJ3cqW+zl0m+Ug1fwRn6XfBzE0AnuRc114JQ==
=C3uB
-----END PGP SIGNATURE-----
--eAbsdosE1cNLO4uF--