Minor fix.

[yaz-moved-to-github.git] / odr / dumpber.c

diff --git a/odr/dumpber.c b/odr/dumpber.c
index b52cabd..1af624a 100644 (file)
--- a/odr/dumpber.c
+++ b/odr/dumpber.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dumpber.c,v $
- * Revision 1.5  1995-10-18 16:12:55  quinn
+ * Revision 1.9  1998-01-14 09:53:26  quinn
+ * Added a bit more info to dump.
+ *
+ * Revision 1.8  1997/05/14 06:53:57  adam
+ * C++ support.
+ *
+ * Revision 1.7  1996/03/08 14:38:41  quinn
+ * Fixed output.
+ *
+ * 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
@@ -27,26 +39,26 @@
 
 static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
 {
-    int res, ll, class, tag, cons;
-    char *b = buf;
+    int res, ll, zclass, tag, cons, lenlen, taglen;
+    char *b = buf, *bp = buf;
     
     if (!len)
        return 0;
     if (!buf[0] && !buf[1])
        return 0;
-    if ((res = ber_dectag((unsigned char*)b, &class, &tag, &cons)) <= 0)
+    if ((res = ber_dectag((unsigned char*)b, &zclass, &tag, &cons)) <= 0)
        return 0;
     if (res > len)
     {
        fprintf(stderr, "Unexpected end of buffer\n");
        return 0;
     }
-    fprintf(stderr, "%5d: %*s", offset, level * 4, "");
-    if (class == ODR_UNIVERSAL)
+    fprintf(f, "%5d: %*s", offset, level * 4, "");
+    if (zclass == ODR_UNIVERSAL)
     {
        static char *nl[] =
        {
-           "Ugh", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING",
+           "[Univ 0]", "BOOLEAN", "INTEGER", "BIT STRING", "OCTET STRING",
            "NULL", "OID", "OBJECT DESCIPTOR", "EXTERNAL", "REAL",
            "ENUM", "[UNIV 11]", "[UNIV 12]", "[UNIV 13]", "[UNIV 14]",
            "[UNIV 15]", "SEQUENCE", "SET", "NUMERICSTRING", "PRINTABLESTRING",
@@ -55,37 +67,41 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
        };
 
        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);
+    else if (zclass == ODR_CONTEXT)
+       fprintf(f, "[%d]", tag);
     else
-       fprintf(stderr, "[%d:%d]", class, tag);
+       fprintf(f, "[%d:%d]", zclass, tag);
     b += res;
+    taglen = res;
     len -= res;
+    bp = b;
     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;
     }
+    lenlen = res;
     b += res;
     len -= res;
     if (ll >= 0)
-       fprintf(stderr, " len=%d\n", ll);
+       fprintf(f, " len=%d", ll);
     else
-       fprintf(stderr, " len=?\n");
+       fprintf(f, " len=?");
+    fprintf(f, "       tl=%d, ll=%d\n", taglen, lenlen);
     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);
@@ -99,7 +115,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
            break;
        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;
@@ -109,7 +125,7 @@ static int do_dumpBER(FILE *f, char *buf, int len, int level, int offset)
     {
        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;