X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2Fdtest.c;h=77258ecb0b13cca246b53983d77bf2d514657122;hb=d5bc370deca67170a41e01033e2cd04a8ba13e41;hp=30d803eb93a70076b2687218c500ad6dbdfcb839;hpb=2d4f915de9a491109a1789464a81e3f02128072e;p=openldap

diff --git a/libraries/liblber/dtest.c b/libraries/liblber/dtest.c
index 30d803eb93..77258ecb0b 100644
--- 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,6 +23,10 @@
  * 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"
 
@@ -23,6 +36,7 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 #include <ac/unistd.h>
+#include <ac/errno.h>
 
 #ifdef HAVE_CONSOLE_H
 #include <console.h>
@@ -30,7 +44,7 @@
 
 #include <lber.h>
 
-static void usage( char *name )
+static void usage( const char *name )
 {
 	fprintf( stderr, "usage: %s fmt\n", name );
 }
@@ -39,13 +53,13 @@ int
 main( int argc, char **argv )
 {
 	char *s;
-	int rc;
 
 	ber_tag_t	tag;
 	ber_len_t	len;
 
 	BerElement	*ber;
 	Sockbuf		*sb;
+	int		fd;
 
 	/* enable debugging */
 	int ival = -1;
@@ -61,20 +75,30 @@ main( int argc, char **argv )
 	cshow( stdout );
 #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",
-	        (unsigned long) tag, (long) len );
+		(unsigned long) tag, (long) len );
 
 	for( s = argv[1]; *s; s++ ) {
 		char buf[128];
@@ -84,9 +108,9 @@ main( int argc, char **argv )
 
 		printf("decode: format %s\n", fmt );
 		len = sizeof(buf);
-		rc = ber_scanf( ber, fmt, &buf[0], &len );
+		tag = ber_scanf( ber, fmt, &buf[0], &len );
 
-		if( rc == LBER_ERROR ) {
+		if( tag == LBER_ERROR ) {
 			perror( "ber_scanf" );
 			return( EXIT_FAILURE );
 		}