[Plib-cvs] CVS: plib/src/pui puFilePicker.cxx,1.24,1.25 puFileSelector.cxx,1.18,1.19
Brought to you by:
sjbaker
From: Sebastian U. <ud...@us...> - 2002-04-15 21:45:01
|
Update of /cvsroot/plib/plib/src/pui In directory usw-pr-cvs1:/tmp/cvs-serv2661 Modified Files: puFilePicker.cxx puFileSelector.cxx Log Message: Mark Follett, John F. Fay: Fixed bug in invalid directory handling Index: puFilePicker.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pui/puFilePicker.cxx,v retrieving revision 1.24 retrieving revision 1.25 diff -u -d -r1.24 -r1.25 --- puFilePicker.cxx 23 Mar 2002 15:06:44 -0000 1.24 +++ puFilePicker.cxx 15 Apr 2002 21:44:58 -0000 1.25 @@ -504,6 +504,7 @@ perror ("puFilePicker") ; ulSetError ( UL_WARNING, "PUI:puFilePicker - can't open directory '%s'", dir ) ; num_files = 0 ; + return ; } while ( ( dp = ulReadDir(dirp) ) != NULL ) @@ -518,7 +519,7 @@ ulSetError ( UL_WARNING, "PUI:puFilePicker - no entries in directory '%s'?!", dir ) ; num_files = 0 ; - return; + return ; } files = new char* [ num_files+1 ] ; Index: puFileSelector.cxx =================================================================== RCS file: /cvsroot/plib/plib/src/pui/puFileSelector.cxx,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- puFileSelector.cxx 23 Mar 2002 15:06:44 -0000 1.18 +++ puFileSelector.cxx 15 Apr 2002 21:44:58 -0000 1.19 @@ -582,6 +582,7 @@ perror ("puFileSelector") ; ulSetError ( UL_WARNING, "PUI:puFileSelector - can't open directory '%s'", dir ) ; num_files = 0 ; + return ; } /* Count the number of files - skipping "." */ @@ -602,7 +603,7 @@ { ulSetError ( UL_WARNING, "PUI:puFileSelector - no entries in directory '%s'?!", dir ) ; - return; + return ; } files = new char* [ num_files+1 ] ; |