X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fdumpber.c;h=95f284db8c04f427def2d6bb75e718d7f4e4fc66;hb=13710cb8cd0a6b8d6a1f88ff69f3a2ec2ec9769c;hp=7ae685de6a38d56e1f7c8d5aa949e9c9ca00d588;hpb=63cafe41a93427118959a74201b3e331169a71d9;p=yaz-moved-to-github.git

diff --git a/odr/dumpber.c b/odr/dumpber.c
index 7ae685d..95f284d 100644
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dumpber.c,v $
- * Revision 1.4  1995-09-29 17:12:21  quinn
+ * Revision 1.6  1996-01-19 15:41:34  quinn
+ * dumpber was ignoring the file argument.
+ *
+ * Revision 1.5  1995/10/18  16:12:55  quinn
+ * Better diagnostics. Added special case in NULL to handle WAIS server.
+ *
+ * Revision 1.4  1995/09/29  17:12:21  quinn
  * Smallish
  *
  * Revision 1.3  1995/09/27  15:02:57  quinn
@@ -22,7 +28,7 @@
 #include <odr.h>
 #include <stdio.h>
 
-static int do_dumpBER(FILE *f, char *buf, int len, int level)
+static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
 {
     int res, ll, class, tag, cons;
     char *b = buf;
@@ -38,7 +44,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
     	fprintf(stderr, "Unexpected end of buffer\n");
     	return 0;
     }
-    fprintf(stderr, "%*s", level * 4, "");
+    fprintf(f, "%5d: %*s", offset, level * 4, "");
     if (class == ODR_UNIVERSAL)
     {
     	static char *nl[] =
@@ -52,37 +58,37 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
 	};
 
 	if (tag < 28)
-	    fprintf(stderr, "%s", nl[tag]);
+	    fprintf(f, "%s", nl[tag]);
 	else
-	    fprintf(stderr, "[UNIV %d]", tag);
+	    fprintf(f, "[UNIV %d]", tag);
     }
     else if (class == ODR_CONTEXT)
-	fprintf(stderr, "[%d]", tag);
+	fprintf(f, "[%d]", tag);
     else
-	fprintf(stderr, "[%d:%d]", class, tag);
+	fprintf(f, "[%d:%d]", class, tag);
     b += res;
     len -= res;
     if ((res = ber_declen((unsigned char*)b, &ll)) <= 0)
     {
-    	fprintf(stderr, "bad length\n");
+    	fprintf(f, "bad length\n");
     	return 0;
     }
     if (res > len)
     {
-    	fprintf(stderr, "Unexpected end of buffer\n");
+    	fprintf(f, "Unexpected end of buffer\n");
     	return 0;
     }
     b += res;
     len -= res;
     if (ll >= 0)
-    	fprintf(stderr, " len=%d\n", ll);
+    	fprintf(f, " len=%d\n", ll);
     else
-    	fprintf(stderr, " len=?\n");
+    	fprintf(f, " len=?\n");
     if (!cons)
     {
     	if (ll < 0)
 	{
-	    fprintf(stderr, "Bad length on primitive type.\n");
+	    fprintf(f, "Bad length on primitive type.\n");
 	    return 0;
 	}
     	return ll + (b - buf);
@@ -94,9 +100,9 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
     {
 	if (ll == -1 && *b == 0 && *(b + 1) == 0)
 	    break;
-	if (!(res = do_dumpBER(f, b, len, level + 1)))
+	if (!(res = do_dumpBER(f, b, len, level + 1, offset + (b - buf))))
 	{
-	    fprintf(stderr, "Dump of content element failed.\n");
+	    fprintf(f, "Dump of content element failed.\n");
 	    return 0;
 	}
 	b += res;
@@ -106,7 +112,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
     {
     	if (len < 2)
 	{
-	    fprintf(stderr, "Buffer too short in indefinite lenght.\n");
+	    fprintf(f, "Buffer too short in indefinite lenght.\n");
 	    return 0;
 	}
 	return (b - buf) + 2;
@@ -116,5 +122,5 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level)
 
 int odr_dumpBER(FILE *f, char *buf, int len)
 {
-    return do_dumpBER(f, buf, len, 0);
+    return do_dumpBER(f, buf, len, 0, 0);
 }