X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=64d0e077b4bf09cfa637e553991c31a0a85a4a5c;hb=46afb30d2d016a9b1581c7ee4ca96d614a35203c;hp=64eda53e87f85cc0145c058cd796d84bfa5d7450;hpb=55d77e0913ff360d639af1841c70d14dc8687584;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 64eda53e..64d0e077 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -1,67 +1,85 @@ -// gdcmDirList.cxx -//----------------------------------------------------------------------------- -#include "gdcmDirList.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmDirList.cxx,v $ + Language: C++ + Date: $Date: 2005/11/28 15:20:33 $ + Version: $Revision: 1.54 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ -#include -#include +#include "gdcmDirList.h" +#include "gdcmUtil.h" +#include "gdcmDebug.h" -#ifdef GDCM_NO_ANSI_STRING_STREAM - #include - #define ostringstream ostrstream -#else - #include -#endif +#include +#include +#include +#include //stat function -#ifdef _MSC_VER +#ifdef _MSC_VER #include #include #else #include - #include + #include #endif -//----------------------------------------------------------------------------- -const char gdcmDirList::SEPARATOR_X = '/'; -const char gdcmDirList::SEPARATOR_WIN = '\\'; -const std::string gdcmDirList::SEPARATOR = "/"; - +namespace gdcm +{ //----------------------------------------------------------------------------- // Constructor / Destructor -/* - * \ingroup gdcmDirList +/** * \brief Constructor - * @param dirName - * @param recursive + * @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(void) +DirList::~DirList() { } -//----------------------------------------------------------------------------- -// Print - //----------------------------------------------------------------------------- // Public -/* - * \ingroup gdcmDirList - * \brief Get the directory name - * @param +/** + * \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(void) +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; + } } //----------------------------------------------------------------------------- @@ -69,70 +87,112 @@ std::string gdcmDirList::GetDirName(void) //----------------------------------------------------------------------------- // Private -/* - * \ingroup gdcmDirList - * \brief Add a SEPARATOR to the end of the directory name is necessary - * @param - */ -void gdcmDirList::NormalizePath(std::string &dirName) -{ - int size=dirName.size(); - if((dirName[size-1]!=SEPARATOR_X)&&(dirName[size-1]!=SEPARATOR_WIN)) - { - dirName+=SEPARATOR; - } -} - -/* - * \ingroup gdcmDirList +/** * \brief Explore a directory with possibility of recursion - * @param + * return number of files read + * @param dirpath directory to explore + * @param recursive whether we want recursion or not */ -void gdcmDirList::Explore(std::string dirName,bool recursive) +int DirList::Explore(std::string const &dirpath, bool recursive) { + int numberOfFiles = 0; std::string fileName; - - NormalizePath(dirName); - -#ifdef _MSC_VER - WIN32_FIND_DATA fileData; - HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); - int found=true; - - while( (hFile!=INVALID_HANDLE_VALUE) && (found) ) + 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); + + for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; + b = FindNextFile(hFile, &fileData)) { - fileName=fileData.cFileName; - if(fileData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY) + fileName = fileData.cFileName; + if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) { - if( (fileName!=".") && (fileName!="..") && (recursive) ) - Explore(dirName+fileName,recursive); + // Need to check for . and .. to avoid infinite loop + if ( fileName != "." && fileName != ".." && recursive ) + { + numberOfFiles += Explore(dirName+fileName,recursive); + } } else { - this->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 - struct dirent **namelist; - int n=scandir(dirName.c_str(), &namelist, 0, alphasort); + // Real POSIX implementation: scandir is a BSD extension only, and doesn't + // work on debian for example - for (int i= 0;i < n; i++) + DIR* dir = opendir(dirName.c_str()); + if (!dir) { - fileName=namelist[i]->d_name; - if(namelist[i]->d_type==DT_DIR) + return 0; + } + + // According to POSIX, the dirent structure contains a field char d_name[] + // 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; + for (d = readdir(dir); d; d = readdir(dir)) + { + fileName = dirName + d->d_name; + if( stat(fileName.c_str(), &buf) != 0 ) + { + const char *str = strerror(errno); + gdcmErrorMacro( str ); + } + if ( S_ISREG(buf.st_mode) ) //is it a regular file? { - if( (fileName!=".") && (fileName!="..") && (recursive) ) - Explore(dirName+fileName,recursive); + Filenames.push_back( fileName ); + numberOfFiles++; + } + else if ( S_ISDIR(buf.st_mode) ) //directory? + { + if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files + { + numberOfFiles += Explore( fileName, recursive); + } } else { - this->push_back(dirName+fileName); + gdcmErrorMacro( "Unexpected error" ); + return -1; } } + 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::copy(Filenames.begin(), Filenames.end(), + std::ostream_iterator(os, "\n")); } //----------------------------------------------------------------------------- +} // end namespace gdcm