From: Andrew M. <fit...@us...> - 2008-04-24 18:38:34
|
Update of /cvsroot/radmind/radmind In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29341 Modified Files: lapply.c lcreate.c Log Message: Standardize checking of snprintf return values. Index: lcreate.c =================================================================== RCS file: /cvsroot/radmind/radmind/lcreate.c,v retrieving revision 1.92 retrieving revision 1.93 diff -C2 -d -r1.92 -r1.93 *** lcreate.c 14 Dec 2007 18:52:22 -0000 1.92 --- lcreate.c 24 Apr 2008 18:38:24 -0000 1.93 *************** *** 361,365 **** if ( snprintf( pathdesc, MAXPATHLEN * 2, "STOR TRANSCRIPT %s", ! tname ) > ( MAXPATHLEN * 2 ) - 1 ) { fprintf( stderr, "STOR TRANSCRIPT %s: path description too long\n", tname ); --- 361,365 ---- if ( snprintf( pathdesc, MAXPATHLEN * 2, "STOR TRANSCRIPT %s", ! tname ) >= ( MAXPATHLEN * 2 )) { fprintf( stderr, "STOR TRANSCRIPT %s: path description too long\n", tname ); *************** *** 476,480 **** } else { if ( snprintf( pathdesc, MAXPATHLEN * 2, "STOR FILE %s %s", ! tname, targv[ 1 ] ) > ( MAXPATHLEN * 2 ) - 1 ) { fprintf( stderr, "STOR FILE %s %s: path description too" " long\n", tname, d_path ); --- 476,480 ---- } else { if ( snprintf( pathdesc, MAXPATHLEN * 2, "STOR FILE %s %s", ! tname, targv[ 1 ] ) >= ( MAXPATHLEN * 2 )) { fprintf( stderr, "STOR FILE %s %s: path description too" " long\n", tname, d_path ); Index: lapply.c =================================================================== RCS file: /cvsroot/radmind/radmind/lapply.c,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** lapply.c 14 Dec 2007 18:52:22 -0000 1.144 --- lapply.c 24 Apr 2008 18:38:24 -0000 1.145 *************** *** 143,147 **** if ( special ) { if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s", ! targv[ 1 ]) > ( MAXPATHLEN * 2 ) - 1 ) { fprintf( stderr, "SPECIAL %s: too long\n", targv[ 1 ]); return( 1 ); --- 143,147 ---- if ( special ) { if ( snprintf( pathdesc, MAXPATHLEN * 2, "SPECIAL %s", ! targv[ 1 ]) >= ( MAXPATHLEN * 2 )) { fprintf( stderr, "SPECIAL %s: too long\n", targv[ 1 ]); return( 1 ); *************** *** 149,153 **** } else { if ( snprintf( pathdesc, MAXPATHLEN * 2, "FILE %s %s", ! transcript, targv[ 1 ]) > ( MAXPATHLEN * 2 ) -1 ) { fprintf( stderr, "FILE %s %s: command too long\n", transcript, targv[ 1 ]); --- 149,153 ---- } else { if ( snprintf( pathdesc, MAXPATHLEN * 2, "FILE %s %s", ! transcript, targv[ 1 ]) >= ( MAXPATHLEN * 2 )) { fprintf( stderr, "FILE %s %s: command too long\n", transcript, targv[ 1 ]); |