X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=98bcde6ebedd6172a82bbcbdb51c7d326e90eecd;hb=f7276083b636d98a16f347fde5916a3fca6855db;hp=2c362f645bbedf4dfe001f579796471d736d461b;hpb=1bd05dcb89e07d352f301179cacc88ebcfb961ee;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 2c362f64..98bcde6e 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2005/04/18 02:29:07 $ - Version: $Revision: 1.49 $ + Date: $Date: 2005/07/12 14:58:26 $ + Version: $Revision: 1.52 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,7 +31,7 @@ #include #endif -namespace gdcm +namespace gdcm { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -64,7 +64,7 @@ bool DirList::IsDirectory(std::string const &dirName) { struct stat fs; assert( dirName[dirName.size()-1] != '/' ); - if(stat(dirName.c_str(), &fs) == 0) + if ( stat(dirName.c_str(), &fs) == 0 ) { #if _WIN32 return ((fs.st_mode & _S_IFDIR) != 0); @@ -102,10 +102,10 @@ int DirList::Explore(std::string const &dirpath, bool recursive) b = FindNextFile(hFile, &fileData)) { fileName = fileData.cFileName; - if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) + if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { // Need to check for . and .. to avoid infinite loop - if( fileName != "." && fileName != ".." && recursive ) + if ( fileName != "." && fileName != ".." && recursive ) { numberOfFiles += Explore(dirName+fileName,recursive); } @@ -129,7 +129,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive) } // According to POSIX, the dirent structure contains a field char d_name[] - // of unspecified size, with at most NAME_MAX characters preceding the + // of unspecified size, with at most NAME_MAX characters preceeding the // terminating null character. Use of other fields will harm the porta- // bility of your programs. @@ -139,14 +139,14 @@ int DirList::Explore(std::string const &dirpath, bool recursive) { fileName = dirName + d->d_name; stat(fileName.c_str(), &buf); //really discard output ? - if( S_ISREG(buf.st_mode) ) //is it a regular file? + if ( S_ISREG(buf.st_mode) ) //is it a regular file? { Filenames.push_back( fileName ); numberOfFiles++; } - else if( S_ISDIR(buf.st_mode) ) //directory? + else if ( S_ISDIR(buf.st_mode) ) //directory? { - if( d->d_name[0] != '.' && recursive ) //we are also skipping hidden files + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files { numberOfFiles += Explore( fileName, recursive); }