upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-22 07:39:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#6723: Handle EOF in test programs

Browse source
This commit is contained in:
Hallvard Furuseth 2010-11-23 12:12:54 +00:00
parent def5d26f13
commit 7c29e2c7c5
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/libldap/dntest.c
View file

@ -81,11 +81,9 @@ main( int argc, char *argv[] )
} }
if ( strcmp( argv[ 1 ], "-" ) == 0 ) { if ( strcmp( argv[ 1 ], "-" ) == 0 ) {
size_t len; size_t len = fgets( buf, sizeof( buf ), stdin ) ? strlen( buf ) : 0;
fgets( buf, sizeof( buf ), stdin ); if ( len == 0 || buf[ --len ] == '\n' ) {
len = strlen( buf );
if ( len > 0 && buf[ --len ] == '\n' ) {
buf[ len ] = '\0'; buf[ len ] = '\0';
} }
strin = buf; strin = buf;
@ -296,4 +294,3 @@ main( int argc, char *argv[] )
return( 0 ); return( 0 );
} }

3
tests/progs/slapd-tester.c
View file

@ -990,7 +990,8 @@ get_search_filters( char *filename, char *filters[], char *attrs[], char *bases[
} else { } else {
bases[filter] = ArgDup( line ); bases[filter] = ArgDup( line );
} }
fgets( line, BUFSIZ, fp ); if ( fgets( line, BUFSIZ, fp ) == NULL )
*line = '\0';
if (( nl = strchr( line, '\r' )) || ( nl = strchr( line, '\n' ))) if (( nl = strchr( line, '\r' )) || ( nl = strchr( line, '\n' )))
*nl = '\0'; *nl = '\0';