Import Gnulib floorf and base64 and removed our old base64 library.

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1926 f882894a-f735-0410-b71e-b25c423dba1c

5 files changed, 9 insertions, 61 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 36ff245c..5d65bed6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,8 +5,8 @@ SUBDIRS = tests
 noinst_LIBRARIES = libnagiosplug.a
 
 
-libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c base64.c
-EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h base64.h
+libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
+EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h
 
 INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
diff --git a/lib/base64.c b/lib/base64.c
deleted file mode 100644
index 1f1fcb8c..00000000
--- a/lib/base64.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/****************************************************************************
-* Function to encode in Base64
-*
-* Written by Lauri Alanko
-*
-*****************************************************************************/
-
-#include "common.h"
-#include "base64.h"
-
-char *
-base64 (const char *bin, size_t len)
-{
-
-        char *buf = (char *) malloc ((len + 2) / 3 * 4 + 1);
-        size_t i = 0, j = 0;
-
-        char BASE64_END = '=';
-        char base64_table[64];
-        strncpy (base64_table, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", 64);
-
-        while (j < len - 2) {
-                buf[i++] = base64_table[bin[j] >> 2];
-                buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
-                buf[i++] = base64_table[((bin[j + 1] & 15) << 2) | (bin[j + 2] >> 6)];
-                buf[i++] = base64_table[bin[j + 2] & 63];
-                j += 3;
-        }
-
-        switch (len - j) {
-        case 1:
-                buf[i++] = base64_table[bin[j] >> 2];
-                buf[i++] = base64_table[(bin[j] & 3) << 4];
-                buf[i++] = BASE64_END;
-                buf[i++] = BASE64_END;
-                break;
-        case 2:
-                buf[i++] = base64_table[bin[j] >> 2];
-                buf[i++] = base64_table[((bin[j] & 3) << 4) | (bin[j + 1] >> 4)];
-                buf[i++] = base64_table[(bin[j + 1] & 15) << 2];
-                buf[i++] = BASE64_END;
-                break;
-        case 0:
-                break;
-        }
-
-        buf[i] = '\0';
-        return buf;
-}
-
diff --git a/lib/base64.h b/lib/base64.h
deleted file mode 100644
index 1e0a0b04..00000000
--- a/lib/base64.h
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Header file for base64.c */
-
-char *base64 (const char *bin, size_t len);
-
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 0ddc8abf..bd25ccfe 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -36,7 +36,7 @@ test_cmd_LDADD = ../utils_cmd.o ../utils_base.o
 test_base64_SOURCES = test_base64.c
 test_base64_CFLAGS = -g -I..
 test_base64_LDFLAGS = -L/usr/local/lib -ltap
-test_base64_LDADD = ../base64.o 
+test_base64_LDADD = $(top_srcdir)/gl/base64.o 
 
 test: ${noinst_PROGRAMS}
         perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_base64.c b/lib/tests/test_base64.c
index e3ff3e35..650cfa1a 100644
--- a/lib/tests/test_base64.c
+++ b/lib/tests/test_base64.c
@@ -18,13 +18,12 @@
 *****************************************************************************/
 
 #include "common.h"
-#include "base64.h"
+#include "gl/base64.h"
 #include "tap.h"
 
 int
 main (int argc, char **argv)
 {
-#if 0  /* The current base64 function doesn't work on 8bit data */
         char random[1024] = {
         0x8b,0xb0,0xc4,0xe2,0xfc,0x22,0x9f,0x0d,0x85,0xe7,0x2c,0xaa,0x39,0xa1,0x46,0x88,
         0x50,0xe6,0x34,0x37,0x0b,0x45,0x4b,0xb8,0xb2,0x86,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -180,8 +179,9 @@ main (int argc, char **argv)
         0x46,0x62,0x5a,0x61,0x35,0x52,0x6e,0x50,0x59,0x43,0x4f,0x36,0x4f,0x70,0x4d,0x6c,
         0x41,0x6e,0x6a,0x4d,0x56,0x41,0x3d,0x3d
         };
-#endif
 
+#if 0
+  /* The old base64 function didn't work on 8bit data, below is 7bit */
         char random[1024] = {
         0x0b,0x30,0x44,0x62,0x7c,0x22,0x1f,0x0d,0x05,0x67,0x2c,0x2a,0x39,0x21,0x46,0x08,
         0x50,0x66,0x34,0x37,0x0b,0x45,0x4b,0x38,0x32,0x06,0x7a,0x3e,0x7f,0x0c,0x40,0x18,
@@ -336,11 +336,13 @@ main (int argc, char **argv)
         0x46,0x54,0x5a,0x61,0x5a,0x52,0x6c,0x50,0x59,0x43,0x4d,0x36,0x4f,0x68,0x4d,0x6c,
         0x41,0x6e,0x68,0x4d,0x56,0x41,0x3d,0x3d,0x00
         };
+#endif
+
         char *b64_test;
 
         plan_tests(1);
 
-        b64_test = base64 (random, 1024);
+        base64_encode_alloc (random, 1024, &b64_test);
 
         ok(strcmp(b64_known, b64_test) == 0,
            "Test matching a base64 encoded 1024 bytes random string");