base64 testing code

src/utils/Makefile

@@ -2,7 +2,7 @@ depth = ..
 include $(depth)/mk/sysconf
 
 PROGS = trconftree wipedir smallut trfstreewalk trpathut \
-      transcode \
+      transcode trbase64 \
       trmimeparse trexecmd utf8iter idfile
 
 all: $(PROGS) $(BIGLIB)
@@ -80,6 +80,13 @@ trconftree.o : conftree.cpp
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_CONFTREE -c -o trconftree.o \
 	       conftree.cpp
 
+BASE64_OBJS= trbase64.o  $(BIGLIB)
+trbase64 : $(BASE64_OBJS) 
+	$(CXX) $(ALL_CXXFLAGS) -o trbase64 $(BASE64_OBJS)
+trbase64.o : base64.cpp 
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_BASE64 -c -o trbase64.o \
+	       base64.cpp
+
 X11MON_OBJS= trx11mon.o x11mon.o
 trx11mon : $(X11MON_OBJS)
 	$(CXX) $(ALL_CXXFLAGS) -o trx11mon $(X11MON_OBJS)  -L/usr/X11R6/lib -lX11

src/utils/base64.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: base64.cpp,v 1.7 2007-12-13 06:58:22 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: base64.cpp,v 1.8 2008-04-18 11:37:50 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -223,40 +223,96 @@ void base64_encode(const string &in, string &out)
 
 #ifdef TEST_BASE64
 #include <stdio.h>
-const char *values[] = {"", "1", "12", "123", "1234", "12345", "123456"};
+
-int nvalues = sizeof(values) / sizeof(char *);
+#include "readfile.h"
+
+const char *thisprog;
+static char usage [] = "testfile\n\n"
+;
+static void
+Usage(void)
+{
+    fprintf(stderr, "%s: usage:\n%s", thisprog, usage);
+    exit(1);
+}
+
+static int     op_flags;
+#define OPT_MOINS 0x1
+#define OPT_i	  0x2 
+#define OPT_P	  0x4 
+
 int main(int argc, char **argv)
 {
-    string in, out, back;
+    thisprog = argv[0];
-    int err = 0;
+    argc--; argv++;
-    for (int i = 0; i < nvalues; i++) {
+
-	in = values[i];
+    while (argc > 0 && **argv == '-') {
+	(*argv)++;
+	if (!(**argv))
+	    /* Cas du "adb - core" */
+	    Usage();
+	while (**argv)
+	    switch (*(*argv)++) {
+	    case 'i':	op_flags |= OPT_i; break;
+	    default: Usage();	break;
+	    }
+	argc--; argv++;
+    }
+    
+    if (op_flags & OPT_i)  {
+	const char *values[] = {"", "1", "12", "123", "1234", 
+				"12345", "123456"};
+	int nvalues = sizeof(values) / sizeof(char *);
+	string in, out, back;
+	int err = 0;
+	for (int i = 0; i < nvalues; i++) {
+	    in = values[i];
+	    base64_encode(in, out);
+	    base64_decode(out, back);
+	    if (in != back) {
+		fprintf(stderr, "In [%s] %d != back [%s] %d (out [%s] %d\n", 
+			in.c_str(), int(in.length()), 
+			back.c_str(), int(back.length()),
+			out.c_str(), int(out.length())
+			);
+		err++;
+	    }
+	}
+	in.erase();
+	in += char(0);
+	in += char(0);
+	in += char(0);
+	in += char(0);
 	base64_encode(in, out);
 	base64_decode(out, back);
 	if (in != back) {
 	    fprintf(stderr, "In [%s] %d != back [%s] %d (out [%s] %d\n", 
-		    in.c_str(),in.length(), 
+		    in.c_str(), int(in.length()), 
-		    back.c_str(), back.length(),
+		    back.c_str(), int(back.length()),
-		    out.c_str(), out.length()
+		    out.c_str(), int(out.length())
 		    );
 	    err++;
 	}
+	exit(!(err == 0));
+    } else {
+	if (argc > 1)
+	    Usage();
+	string infile;
+	if (argc == 1)
+	    infile = *argv++;argc--;
+	string idata, reason;
+	if (!file_to_string(infile, idata, &reason)) {
+	    fprintf(stderr, "Can't read file: %s\n", reason.c_str());
+	    exit(1);
+	}
+	string odata;
+	if (!base64_decode(idata, odata)) {
+	    fprintf(stderr, "Decoding failed\n");
+	    exit(1);
+	}
+	write(1, odata.c_str(), 
+	      odata.size() * sizeof(string::value_type));
+	exit(0);
     }
-    in.erase();
-    in += char(0);
-    in += char(0);
-    in += char(0);
-    in += char(0);
-    base64_encode(in, out);
-    base64_decode(out, back);
-    if (in != back) {
-	fprintf(stderr, "In [%s] %d != back [%s] %d (out [%s] %d\n", 
-		in.c_str(),in.length(), 
-		back.c_str(), back.length(),
-		out.c_str(), out.length()
-		);
-	err++;
-    }
-    exit(!(err == 0));
 }
 #endif

src/utils/readfile.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: readfile.cpp,v 1.7 2007-12-13 06:58:22 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: readfile.cpp,v 1.8 2008-04-18 11:37:50 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 /*
  *   This program is free software; you can redistribute it and/or modify
@@ -51,12 +51,18 @@ static void caterrno(string *reason)
 bool file_to_string(const string &fn, string &data, string *reason)
 {
     bool ret = false;
+    bool noclosing = true;
+    int fd = 0;
 
-    int fd = open(fn.c_str(), O_RDONLY|O_STREAMING);
+    if (!fn.empty()) {
-    if (fd < 0) {
+	fd = open(fn.c_str(), O_RDONLY|O_STREAMING);
-        caterrno(reason);
+	if (fd < 0) {
-	return false;
+	    caterrno(reason);
+	    return false;
+	}
+	noclosing = false;
     }
+
     char buf[4096];
     for (;;) {
 	int n = read(fd, buf, 4096);
@@ -77,7 +83,7 @@ bool file_to_string(const string &fn, string &data, string *reason)
 
     ret = true;
  out:
-    if (fd >= 0)
+    if (fd >= 0 && !noclosing)
 	close(fd);
     return ret;
 }