X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fbprint.c;h=12862427d489e841a913df8b3f14f8fc206d81ef;hb=e86e39ad311e12c79967c2da07fd9f0a1c513188;hp=e4b6fd27ea2b9ee5def85b5ab39d3c5eef286e19;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/libraries/liblber/bprint.c b/libraries/liblber/bprint.c
index e4b6fd27ea..12862427d4 100644
--- a/libraries/liblber/bprint.c
+++ b/libraries/liblber/bprint.c
@@ -1,32 +1,126 @@
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+
+#include "portable.h"
+
 #include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include "lber.h"
+
+#include <ac/ctype.h>
+#include <ac/stdarg.h>
+#include <ac/string.h>
+
+#include "lber-int.h"
+
+/*
+ * Print stuff
+ */
+static void
+lber_error_print( char *data )
+{
+	fputs( data, stderr );
+	fflush( stderr );
+}
+
+BER_LOG_PRINT_FN lber_pvt_log_print = lber_error_print;
+
+/*
+ * lber log 
+ */
+
+static int lber_log_check( int errlvl, int loglvl )
+{
+	return errlvl & loglvl ? 1 : 0;
+}
+
+int lber_pvt_log_printf
+#ifdef HAVE_STDARG
+	(int errlvl, int loglvl, char *fmt, ...)
+#else
+	( va_alist )
+va_dcl
+#endif
+{
+	char buf[ 1024 ];
+	va_list ap;
+
+#ifdef HAVE_STDARG
+	va_start( ap, fmt );
+#else
+	int errlvl, loglvl;
+	char *fmt;
+
+	va_start( ap );
+
+	errlvl = va_arg( ap, int );
+	loglvl = va_arg( ap, int );
+	fmt = va_arg( ap, char * );
+#endif
+
+	if ( !lber_log_check( errlvl, loglvl )) {
+		return 0;
+	}
+
+#ifdef HAVE_VSNPRINTF
+	buf[sizeof(buf) - 1] = '\0';
+	vsnprintf( buf, sizeof(buf)-1, fmt, ap );
+#elif HAVE_VSPRINTF
+	vsprintf( buf, fmt, ap ); /* hope it's not too long */
+#else
+	/* use doprnt() */
+	chokeme = "choke me! I don't have a doprnt manual handy!";
+#endif
+
+	va_end(ap);
+
+	(*lber_pvt_log_print)( buf );
+	return 1;
+}
+
+static int lber_log_puts(int errlvl, int loglvl, char *buf)
+{
+	if ( !lber_log_check( errlvl, loglvl )) {
+		return 0;
+	}
+
+	(*lber_pvt_log_print)( buf );
+	return 1;
+}
 
 /*
  * Print arbitrary stuff, for debugging.
  */
 
-#ifdef LDAP_DEBUG
+int
+lber_log_bprint(int errlvl, int loglvl, char *data, int len )
+{
+	if ( !lber_log_check( errlvl, loglvl )) {
+		return 0;
+	}
 
-#ifndef NO_USERINTERFACE
-#define BPLEN	48
+	ber_bprint(data, len);
+	return 1;
+}
 
 void
-lber_bprint( char *data, int len )
+ber_bprint(char *data, int len )
 {
-    static char	hexdig[] = "0123456789abcdef";
+    static const char	hexdig[] = "0123456789abcdef";
+#define BPLEN	48
     char	out[ BPLEN ];
+    char	buf[ BPLEN + sizeof("\t%s\n") ];
     int		i = 0;
 
     memset( out, 0, BPLEN );
     for ( ;; ) {
 	if ( len < 1 ) {
-	    fprintf( stderr, "\t%s\n", ( i == 0 ) ? "(end)" : out );
+	    sprintf( buf, "\t%s\n", ( i == 0 ) ? "(end)" : out );
+		(*lber_pvt_log_print)( buf );
 	    break;
 	}
 
-#ifndef HEX
+#ifndef LDAP_HEX
 	if ( isgraph( (unsigned char)*data )) {
 	    out[ i ] = ' ';
 	    out[ i+1 ] = *data;
@@ -34,7 +128,7 @@ lber_bprint( char *data, int len )
 #endif
 	    out[ i ] = hexdig[ ( *data & 0xf0 ) >> 4 ];
 	    out[ i+1 ] = hexdig[ *data & 0x0f ];
-#ifndef HEX
+#ifndef LDAP_HEX
 	}
 #endif
 	i += 2;
@@ -42,7 +136,9 @@ lber_bprint( char *data, int len )
 	data++;
 
 	if ( i > BPLEN - 2 ) {
-	    fprintf( stderr, "\t%s\n", out );
+		char data[128 + BPLEN];
+	    sprintf( data, "\t%s\n", out );
+		(*lber_pvt_log_print)(data);
 	    memset( out, 0, BPLEN );
 	    i = 0;
 	    continue;
@@ -50,11 +146,75 @@ lber_bprint( char *data, int len )
 	out[ i++ ] = ' ';
     }
 }
-#else /* NO_USERINTERFACE */
+
+int
+lber_log_dump( int errlvl, int loglvl, BerElement *ber, int inout )
+{
+	if ( !lber_log_check( errlvl, loglvl )) {
+		return 0;
+	}
+
+	ber_dump(ber, inout);
+	return 1;
+}
+
+void
+ber_dump( BerElement *ber, int inout )
+{
+	char buf[132];
+
+	sprintf( buf, "ber_dump: buf 0x%lx, ptr 0x%lx, end 0x%lx\n",
+	    (long) ber->ber_buf,
+		(long) ber->ber_ptr,
+		(long) ber->ber_end );
+
+	(*lber_pvt_log_print)( buf );
+
+	if ( inout == 1 ) {
+		sprintf( buf, "          current len %ld, contents:\n",
+		    (long) (ber->ber_end - ber->ber_ptr) );
+		ber_bprint( ber->ber_ptr, ber->ber_end - ber->ber_ptr );
+
+	} else {
+		sprintf( buf, "          current len %ld, contents:\n",
+		    (long) (ber->ber_ptr - ber->ber_buf) );
+
+		ber_bprint( ber->ber_buf, ber->ber_ptr - ber->ber_buf );
+	}
+}
+
+int
+lber_log_sos_dump( int errlvl, int loglvl, Seqorset *sos )
+{
+	if ( !lber_log_check( errlvl, loglvl )) {
+		return 0;
+	}
+
+	ber_sos_dump( sos );
+	return 1;
+}
+
 void
-lber_bprint( char *data, int len )
+ber_sos_dump( Seqorset *sos )
 {
+	char buf[132];
+
+	(*lber_pvt_log_print)( "*** sos dump ***\n" );
+
+	while ( sos != NULLSEQORSET ) {
+		sprintf( buf, "ber_sos_dump: clen %ld first 0x%lx ptr 0x%lx\n",
+		    (long) sos->sos_clen, (long) sos->sos_first, (long) sos->sos_ptr );
+		(*lber_pvt_log_print)( buf );
+
+		sprintf( buf, "              current len %ld contents:\n",
+		    (long) (sos->sos_ptr - sos->sos_first) );
+		(*lber_pvt_log_print)( buf );
+
+		ber_bprint( sos->sos_first, sos->sos_ptr - sos->sos_first );
+
+		sos = sos->sos_next;
+	}
+
+	(*lber_pvt_log_print)( "*** end dump ***\n" );
 }
-#endif /* NO_USERINTERFACE */
 
-#endif