updated the 3.0 branch from the head branch - ready for alpha18

[samba.git] / source3 / lib / snprintf.c

diff --git a/source3/lib/snprintf.c b/source3/lib/snprintf.c
index 0511a2bf146362f794533c348706153fe9d73a0f..cd1e63ce59fe66504f0b0101509c88bb02f46312 100644 (file)
--- a/source3/lib/snprintf.c
+++ b/source3/lib/snprintf.c
@@ -57,6 +57,12 @@
 
 #ifndef NO_CONFIG_H /* for some tests */
 #include "config.h"
+#else
+#define NULL 0
+#endif
+
+#ifdef TEST_SNPRINTF /* need math library headers for testing */
+#include <math.h>
 #endif
 
 #ifdef HAVE_STRING_H
@@ -94,8 +100,21 @@
 #define LLONG long
 #endif
 
+/* free memory if the pointer is valid and zero the pointer */
+#ifndef SAFE_FREE
+#define SAFE_FREE(x) do { if ((x) != NULL) {free((x)); (x)=NULL;} } while(0)
+#endif
+
+#ifndef VA_COPY
+#ifdef HAVE_VA_COPY
+#define VA_COPY(dest, src) __va_copy(dest, src)
+#else
+#define VA_COPY(dest, src) (dest) = (src)
+#endif
+#endif
+
 static size_t dopr(char *buffer, size_t maxlen, const char *format, 
-                  va_list args);
+                  va_list args_in);
 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,
@@ -138,7 +157,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c);
 #define MAX(p,q) (((p) >= (q)) ? (p) : (q))
 #endif
 
-static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args)
+static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args_in)
 {
        char ch;
        LLONG value;
@@ -150,6 +169,9 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
        int flags;
        int cflags;
        size_t currlen;
+       va_list args;
+
+       VA_COPY(args, args_in);
        
        state = DP_S_DEFAULT;
        currlen = flags = cflags = min = 0;
@@ -333,6 +355,7 @@ static size_t dopr(char *buffer, size_t maxlen, const char *format, va_list args
                                break;
                        case 's':
                                strvalue = va_arg (args, char *);
+                               if (!strvalue) strvalue = "(NULL)";
                                if (max == -1) {
                                        max = strlen(strvalue);
                                }
@@ -655,9 +678,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
 
        /* Convert integer part */
        do {
-               temp = intpart;
-               my_modf(intpart*0.1, &intpart);
-               temp = temp*0.1;
+               temp = intpart*0.1;
+               my_modf(temp, &intpart);
                index = (int) ((temp -intpart +0.05)* 10.0);
                /* index = (int) (((double)(temp*0.1) -intpart +0.05) *10.0); */
                /* printf ("%llf, %f, %x\n", temp, intpart, index); */
@@ -671,9 +693,8 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
        if (fracpart)
        {
                do {
-                       temp = fracpart;
-                       my_modf(fracpart*0.1, &fracpart);
-                       temp = temp*0.1;
+                       temp = fracpart*0.1;
+                       my_modf(temp, &fracpart);
                        index = (int) ((temp -fracpart +0.05)* 10.0);
                        /* index = (int) ((((temp/10) -fracpart) +0.05) *10); */
                        /* printf ("%lf, %lf, %ld\n", temp, fracpart, index); */
@@ -725,14 +746,14 @@ static void fmtfp (char *buffer, size_t *currlen, size_t maxlen,
        if (max > 0) {
                dopr_outch (buffer, currlen, maxlen, '.');
                
+               while (zpadlen > 0) {
+                       dopr_outch (buffer, currlen, maxlen, '0');
+                       --zpadlen;
+               }
+
                while (fplace > 0) 
                        dopr_outch (buffer, currlen, maxlen, fconvert[--fplace]);
        }
-       
-       while (zpadlen > 0) {
-               dopr_outch (buffer, currlen, maxlen, '0');
-               --zpadlen;
-       }
 
        while (padlen < 0) {
                dopr_outch (buffer, currlen, maxlen, ' ');
@@ -748,7 +769,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
        (*currlen)++;
 }
 
-/* yes this really must be a ||. Don't muck wiith this (tridge) */
+/* yes this really must be a ||. Don't muck with this (tridge) */
 #if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
  int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
@@ -756,7 +777,14 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
 }
 #endif
 
-/* yes this really must be a ||. Don't muck wiith this (tridge) */
+/* yes this really must be a ||. Don't muck wiith this (tridge)
+ *
+ * The logic for these two is that we need our own definition if the
+ * OS *either* has no definition of *sprintf, or if it does have one
+ * that doesn't work properly according to the autoconf test.  Perhaps
+ * these should really be smb_snprintf to avoid conflicts with buggy
+ * linkers? -- mbp
+ */
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_SNPRINTF)
  int snprintf(char *str,size_t count,const char *fmt,...)
 {
@@ -776,13 +804,19 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
  int vasprintf(char **ptr, const char *format, va_list ap)
 {
        int ret;
+       va_list ap2;
+
+       VA_COPY(ap2, ap);
        
-       ret = vsnprintf(NULL, 0, format, ap);
+       ret = vsnprintf(NULL, 0, format, ap2);
        if (ret <= 0) return ret;
 
        (*ptr) = (char *)malloc(ret+1);
        if (!*ptr) return -1;
-       ret = vsnprintf(*ptr, ret+1, format, ap);
+
+       VA_COPY(ap2, ap);
+
+       ret = vsnprintf(*ptr, ret+1, format, ap2);
 
        return ret;
 }
@@ -795,6 +829,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
        va_list ap;
        int ret;
        
+       *ptr = NULL;
        va_start(ap, format);
        ret = vasprintf(ptr, format, ap);
        va_end(ap);
@@ -830,7 +865,7 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
                NULL
        };
        double fp_nums[] = { 6442452944.1234, -1.5, 134.21, 91340.2, 341.1234, 0203.9, 0.96, 0.996, 
-                            0.9996, 1.996, 4.136,  0};
+                            0.9996, 1.996, 4.136, 5.030201, 0};
        char *int_fmt[] = {
                "%-1.5d",
                "%1.5d",
@@ -925,8 +960,10 @@ static void dopr_outch(char *buffer, size_t *currlen, size_t maxlen, char c)
        {
                double v0 = 0.12345678901234567890123456789012345678901;
                for (x=0; x<100; x++) {
-                       snprintf(buf1, sizeof(buf1), "%1.1f", v0*pow(10, x));
-                       sprintf(buf2,                "%1.1f", v0*pow(10, x));
+                       double p = pow(10, x); 
+                       double r = v0*p;
+                       snprintf(buf1, sizeof(buf1), "%1.1f", r);
+                       sprintf(buf2,                "%1.1f", r);
                        if (strcmp(buf1, buf2)) {
                                printf("we seem to support %d digits\n", x-1);
                                break;