Merge branch 'mdb.master' of ssh://git-master.openldap.org/~git/git/openldap

[openldap] / libraries / libldap / dntest.c

diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index 0ee80283b09e97ee8219e705ac14232563089abe..25c82809eb93baf280df1ccb58083702584e47ab 100644 (file)
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2010 The OpenLDAP Foundation.
+ * Copyright 1998-2011 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -81,11 +81,9 @@ main( int argc, char *argv[] )
        }
 
        if ( strcmp( argv[ 1 ], "-" ) == 0 ) {
-               size_t len;
-               
-               fgets( buf, sizeof( buf ), stdin );
-               len = strlen( buf );
-               if ( len > 0 && buf[ --len ] == '\n' ) {
+               size_t len = fgets( buf, sizeof( buf ), stdin ) ? strlen( buf ) : 0;
+
+               if ( len == 0 || buf[ --len ] == '\n' ) {
                        buf[ len ] = '\0';
                }
                strin = buf;
@@ -296,4 +294,3 @@ main( int argc, char *argv[] )
 
        return( 0 );
 }
-