2003-01-28 Havoc Pennington <hp@redhat.com>

	* dbus/dbus-string.c (_dbus_string_base64_decode): append bytes in
	the reverse order from how I had it
	(_dbus_string_base64_encode): reverse encoding order. I was
	basically byteswapping everything during encoding.

2 files changed, 50 insertions, 1 deletions

diff --git a/test/Makefile.am b/test/Makefile.am
index a2139166..f5933b77 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES=-I$(top_srcdir) $(DBUS_TEST_CFLAGS) 
 
 if DBUS_BUILD_TESTS
-TEST_BINARIES=echo-client echo-server
+TEST_BINARIES=echo-client echo-server unbase64
 else
 TEST_BINARIES=
 endif
@@ -19,10 +19,15 @@ echo_server_SOURCES=				\
 	watch.c					\
 	watch.h
 
+unbase64_SOURCES=				\
+	unbase64.c
+
+
 TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la $(top_builddir)/dbus/libdbus-1.la
 
 echo_client_LDADD=$(TEST_LIBS)
 echo_server_LDADD=$(TEST_LIBS)
+unbase64_LDADD=$(TEST_LIBS)
 
 dist-hook:
 	DIRS="data data/valid-messages data/invalid-messages data/incomplete-messages" ; \
diff --git a/test/unbase64.c b/test/unbase64.c
new file mode 100644
index 00000000..cc123658
--- /dev/null
+++ b/test/unbase64.c
@@ -0,0 +1,44 @@
+#include <dbus/dbus.h>
+#define DBUS_COMPILATION /* cheat and use string etc. */
+#include <dbus/dbus-string.h>
+#include <dbus/dbus-sysdeps.h>
+#include <dbus/dbus-internals.h>
+#undef DBUS_COMPILATION
+#include <stdio.h>
+
+int
+main (int    argc,
+      char **argv)
+{
+  DBusString contents;
+  DBusString decoded;
+  DBusString filename;
+  const char *s;
+  
+  if (argc < 2)
+    {
+      fprintf (stderr, "Give the file to decode as an argument\n");
+      return 1;
+    }
+
+  _dbus_string_init_const (&filename, argv[1]);
+  
+  if (!_dbus_string_init (&contents, _DBUS_INT_MAX))
+    return 1;
+
+  if (!_dbus_string_init (&decoded, _DBUS_INT_MAX))
+    return 1;
+
+  if (_dbus_file_get_contents (&contents, &filename) != DBUS_RESULT_SUCCESS)
+    return 1;
+
+  if (!_dbus_string_base64_decode (&contents, 0,
+                                   &decoded, 0))
+    return 1;
+
+  _dbus_string_get_const_data (&decoded, &s);
+  
+  fputs (s, stdout);
+  
+  return 0;
+}