X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=caa8d7d52152ec2aa857ba188b9e7be55715d1a3;hb=c2975ffb8c79fa4d745368d8d1c317c5a313dd0a;hp=27fd7eae6532951b2df6d0347793cca68dd0b59c;hpb=fd37aa842b5d31ca266b6bda8a77f3201d02338d;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 27fd7eae..caa8d7d5 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2004/09/27 08:39:06 $ - Version: $Revision: 1.21 $ + Date: $Date: 2005/11/29 17:21:34 $ + Version: $Revision: 1.56 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -18,57 +18,68 @@ #include "gdcmDirList.h" #include "gdcmUtil.h" +#include "gdcmDebug.h" -#include -#include +#include +#include +#include +#include //stat function -#if defined(_MSC_VER) || defined (__CYGWIN__) - #include #ifdef _MSC_VER + #include #include -#endif //_MSC_VER #else #include - #include - #include #include #endif +namespace gdcm +{ +//----------------------------------------------------------------------------- // Constructor / Destructor /** - * \ingroup gdcmDirList * \brief Constructor * @param dirName root directory name * @param recursive whether we want to explore recursively or not */ -gdcmDirList::gdcmDirList(std::string dirName, bool recursive) +DirList::DirList(std::string const &dirName, bool recursive) { - name = dirName; - NormalizePath(name); - Explore(name, recursive); + DirName = dirName; + Explore(dirName, recursive); } /** - * \ingroup gdcmDirList * \brief Destructor */ -gdcmDirList::~gdcmDirList() +DirList::~DirList() { } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public /** - * \ingroup gdcmDirList - * \brief Get the directory name - * @return the directory name + * \brief Tells us if file name corresponds to a Directory + * @param dirName file name to check + * @return true if the file IS a Directory */ -std::string gdcmDirList::GetDirName() +bool DirList::IsDirectory(std::string const &dirName) { - return name; + struct stat fs; + assert( dirName[dirName.size()-1] != '/' ); + if ( stat(dirName.c_str(), &fs) == 0 ) + { +#if _WIN32 + return ((fs.st_mode & _S_IFDIR) != 0); +#else + return S_ISDIR(fs.st_mode); +#endif + } + else + { + const char *str = strerror(errno); + gdcmStaticErrorMacro( str ); + return false; + } } //----------------------------------------------------------------------------- @@ -76,42 +87,46 @@ std::string gdcmDirList::GetDirName() //----------------------------------------------------------------------------- // Private - /** - * \ingroup gdcmDirList * \brief Explore a directory with possibility of recursion * return number of files read - * @param dirName directory to explore + * @param dirpath directory to explore * @param recursive whether we want recursion or not */ -int gdcmDirList::Explore(std::string dirName, bool recursive) +int DirList::Explore(std::string const &dirpath, bool recursive) { int numberOfFiles = 0; std::string fileName; - NormalizePath(dirName); -#if defined(_MSC_VER) || (__CYGWIN__) - WIN32_FIND_DATA fileData; - HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); - int found = true; + std::string dirName = Util::NormalizePath(dirpath); +#ifdef _MSC_VER + WIN32_FIND_DATA fileData; + assert( dirName[dirName.size()-1] == '/' ); + HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); - while( hFile != INVALID_HANDLE_VALUE && found ) + for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; + b = FindNextFile(hFile, &fileData)) { fileName = fileData.cFileName; - if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) + if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { - // Is the '.' and '..' usefull ? - if( fileName != "." && fileName != ".." && recursive ) + // Need to check for . and .. to avoid infinite loop + if ( fileName != "." && fileName != ".." && recursive ) { numberOfFiles += Explore(dirName+fileName,recursive); } } else { - push_back(dirName+fileName); + Filenames.push_back(dirName+fileName); numberOfFiles++; } - - found = FindNextFile(hFile,&fileData); + } + DWORD dwError = GetLastError(); + if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile); + if (dwError != ERROR_NO_MORE_FILES) + { + gdcmErrorMacro("FindNextFile error. Error is " << dwError); + return -1; } #else @@ -125,38 +140,59 @@ int gdcmDirList::Explore(std::string dirName, 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 - // terminating null character. Use of other fields will harm the porta- - // bility of your programs. + // 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. struct stat buf; - dirent* d = 0; + dirent *d; for (d = readdir(dir); d; d = readdir(dir)) { 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( stat(fileName.c_str(), &buf) != 0 ) { - push_back( fileName ); + const char *str = strerror(errno); + gdcmErrorMacro( str ); + } + 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); } } else { - // we might need to do a different treament - //abort(); + gdcmErrorMacro( "Unexpected error" ); + return -1; } } - closedir(dir); + if( closedir(dir) != 0 ) + { + const char *str = strerror(errno); + gdcmErrorMacro( str ); + } #endif return numberOfFiles; } //----------------------------------------------------------------------------- +// Print +/** + * \brief Print method + * @param os ostream to write to + */ +void DirList::Print(std::ostream &os, std::string const &) +{ + std::copy(Filenames.begin(), Filenames.end(), + std::ostream_iterator(os, "\n")); +} + +//----------------------------------------------------------------------------- +} // end namespace gdcm