Fix typo in last commit

[openldap] / libraries / liblber / dtest.c

diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c
index d2f72154b46b526c9773a11efae4f7e8f1502085..633d42ed7edaaf8ffa3652fbc46af920dee91132 100644 (file)
--- a/libraries/liblber/dtest.c
+++ b/libraries/liblber/dtest.c
@@ -1,5 +1,10 @@
 /* dtest.c - lber decoding test program */
+/* $OpenLDAP$ */
 /*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
+/* Portions
  * Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
@@ -14,17 +19,17 @@
 #include "portable.h"
 
 #include <stdio.h>
-#include <stdlib.h>
 
+#include <ac/stdlib.h>
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/unistd.h>
 
 #ifdef HAVE_CONSOLE_H
 #include <console.h>
-#endif /* MACOS */
+#endif
 
-#include "lber-int.h"
+#include <lber.h>
 
 static void usage( char *name )
 {
@@ -34,32 +39,64 @@ static void usage( char *name )
 int
 main( int argc, char **argv )
 {
-       long            i;
-       unsigned long   len;
-       int             tag;
-       BerElement      ber;
-       Sockbuf         sb;
+       char *s;
+       int rc;
+
+       ber_tag_t       tag;
+       ber_len_t       len;
+
+       BerElement      *ber;
+       Sockbuf         *sb;
+       int             fd;
+
+       /* enable debugging */
+       int ival = -1;
+       ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ival );
+
+       if ( argc < 2 ) {
+               usage( argv[0] );
+               return( EXIT_FAILURE );
+       }
 
 #ifdef HAVE_CONSOLE_H
        ccommand( &argv );
        cshow( stdout );
-#endif /* MACOS */
+#endif
 
-       memset( &sb, 0, sizeof(sb) );
-       sb.sb_sd = 0;
-       sb.sb_ber.ber_buf = NULL;
+       sb = ber_sockbuf_alloc();
+       fd = fileno( stdin );
+       ber_sockbuf_add_io( sb, &ber_sockbuf_io_fd, LBER_SBIOD_LEVEL_PROVIDER,
+               (void *)&fd );
 
-       if ( (tag = ber_get_next( &sb, &len, &ber )) == -1 ) {
+       if( (ber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+               perror( "ber_alloc_t" );
+               return( EXIT_FAILURE );
+       }
+
+       if(( tag = ber_get_next( sb, &len, ber) ) == LBER_ERROR ) {
                perror( "ber_get_next" );
-               exit( 1 );
+               return( EXIT_FAILURE );
        }
-       printf( "message has tag 0x%x and length %ld\n", tag, len );
 
-       if ( ber_scanf( &ber, "i", &i ) == -1 ) {
-               fprintf( stderr, "ber_scanf returns -1\n" );
-               exit( 1 );
+       printf("decode: message tag 0x%lx and length %ld\n",
+               (unsigned long) tag, (long) len );
+
+       for( s = argv[1]; *s; s++ ) {
+               char buf[128];
+               char fmt[2];
+               fmt[0] = *s;
+               fmt[1] = '\0';
+
+               printf("decode: format %s\n", fmt );
+               len = sizeof(buf);
+               rc = ber_scanf( ber, fmt, &buf[0], &len );
+
+               if( rc == LBER_ERROR ) {
+                       perror( "ber_scanf" );
+                       return( EXIT_FAILURE );
+               }
        }
-       printf( "got int %d\n", i );
 
-       return( 0 );
+       ber_sockbuf_free( sb );
+       return( EXIT_SUCCESS );
 }