ITS#7712

[openldap] / libraries / liblber / dtest.c

diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c
index 9fadb37edf48acc147e5727b4cd4580b803f1200..77258ecb0b13cca246b53983d77bf2d514657122 100644 (file)
--- a/libraries/liblber/dtest.c
+++ b/libraries/liblber/dtest.c
@@ -1,10 +1,19 @@
 /* dtest.c - lber decoding test program */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2013 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions
- * Copyright (c) 1990 Regents of the University of Michigan.
+/* Portions Copyright (c) 1990 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -14,23 +23,28 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* ACKNOWLEDGEMENTS:
+ * This work was originally developed by the University of Michigan
+ * (as part of U-MICH LDAP).
+ */
 
 #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>
+#include <ac/errno.h>
 
 #ifdef HAVE_CONSOLE_H
 #include <console.h>
-#endif /* MACOS */
+#endif
 
-#include "lber-int.h"
+#include <lber.h>
 
-static void usage( char *name )
+static void usage( const char *name )
 {
        fprintf( stderr, "usage: %s fmt\n", name );
 }
@@ -39,15 +53,17 @@ int
 main( int argc, char **argv )
 {
        char *s;
-       int rc;
 
-       unsigned long tag, len;
+       ber_tag_t       tag;
+       ber_len_t       len;
 
        BerElement      *ber;
        Sockbuf         *sb;
+       int             fd;
 
        /* enable debugging */
-       ber_int_debug = -1;
+       int ival = -1;
+       ber_set_option( NULL, LBER_OPT_DEBUG_LEVEL, &ival );
 
        if ( argc < 2 ) {
                usage( argv[0] );
@@ -57,22 +73,32 @@ main( int argc, char **argv )
 #ifdef HAVE_CONSOLE_H
        ccommand( &argv );
        cshow( stdout );
-#endif /* MACOS */
+#endif
 
-       sb = ber_sockbuf_alloc_fd( fileno(stdin) );
+       sb = ber_sockbuf_alloc();
+       fd = fileno( stdin );
+       ber_sockbuf_add_io( sb, &ber_sockbuf_io_fd, LBER_SBIOD_LEVEL_PROVIDER,
+               (void *)&fd );
 
-       if( (ber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
+       ber = ber_alloc_t(LBER_USE_DER);
+       if( ber == NULL ) {
                perror( "ber_alloc_t" );
                return( EXIT_FAILURE );
        }
 
-       if(( tag = ber_get_next( sb, &len, ber) ) == LBER_ERROR ) {
+       for (;;) {
+               tag = ber_get_next( sb, &len, ber);
+               if( tag != LBER_ERROR ) break;
+
+               if( errno == EWOULDBLOCK ) continue;
+               if( errno == EAGAIN ) continue;
+
                perror( "ber_get_next" );
                return( EXIT_FAILURE );
        }
 
        printf("decode: message tag 0x%lx and length %ld\n",
-               tag, len );
+               (unsigned long) tag, (long) len );
 
        for( s = argv[1]; *s; s++ ) {
                char buf[128];
@@ -81,9 +107,10 @@ main( int argc, char **argv )
                fmt[1] = '\0';
 
                printf("decode: format %s\n", fmt );
-               rc = ber_scanf( ber, fmt, buf );
+               len = sizeof(buf);
+               tag = ber_scanf( ber, fmt, &buf[0], &len );
 
-               if( rc == LBER_ERROR ) {
+               if( tag == LBER_ERROR ) {
                        perror( "ber_scanf" );
                        return( EXIT_FAILURE );
                }