hex escape everything requires escape (uncomment #define PRETTY_ESCAPE to revert...

[openldap] / libraries / liblber / etest.c

diff --git a/libraries/liblber/etest.c b/libraries/liblber/etest.c
index 0099e82ff52638869eb77709a7c57d2f2432cb73..863cd7e563d3e9bbf3ccaeae368a1264934e98a5 100644 (file)
--- a/libraries/liblber/etest.c
+++ b/libraries/liblber/etest.c
@@ -1,6 +1,7 @@
 /* test.c - lber encoding test program */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* Portions
@@ -11,7 +12,8 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
+
+#include <ac/stdlib.h>
 
 #include <ac/socket.h>
 #include <ac/string.h>
@@ -21,14 +23,14 @@
 #include <console.h>
 #endif /* HAVE_CONSOLE_H */
 
-#include "lber-int.h"
+#include "lber.h"
 
-static void usage( char *name )
+static void usage( const char *name )
 {
        fprintf( stderr, "usage: %s fmtstring\n", name );
 }
 
-static char* getbuf() {
+static char* getbuf( void ) {
        char *p;
        static char buf[128];
 
@@ -51,7 +53,8 @@ main( int argc, char **argv )
        Sockbuf         *sb;
 
        /* enable debugging */
-       ber_int_debug = -1;
+       int ival = -1;
+       ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ival );
 
        if ( argc < 2 ) {
                usage( argv[0] );
@@ -70,12 +73,14 @@ main( int argc, char **argv )
 
 #else
        fd = fileno(stdout);
-#endif /* MACOS */
+#endif
 
-       sb = ber_sockbuf_alloc_fd( fd );
+       sb = ber_sockbuf_alloc();
+       ber_sockbuf_add_io( sb, &ber_sockbuf_io_fd, LBER_SBIOD_LEVEL_PROVIDER,
+               (void *)&fd );
 
        if( sb == NULL ) {
-               perror( "lber_sockbuf_alloc_fd" );
+               perror( "ber_sockbuf_alloc_fd" );
                return( EXIT_FAILURE );
        }
 
@@ -127,9 +132,7 @@ main( int argc, char **argv )
                        break;
 
                default:
-#ifdef LDAP_LIBUI
-                       fprintf( stderr, "unknown fmt %c\n", *fmt );
-#endif /* LDAP_LIBUI */
+                       fprintf( stderr, "encode: unknown fmt %c\n", *fmt );
                        rc = -1;
                        break;
                }
@@ -141,7 +144,7 @@ main( int argc, char **argv )
        }
 
        fprintf(stderr, "encode: end\n" );
-       if( ber_printf( ber, /*{*/ "}" ) == -1 ) {
+       if( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
                perror( /*{*/ "ber_printf }" );
                return( EXIT_FAILURE );
        }