X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=98bcde6ebedd6172a82bbcbdb51c7d326e90eecd;hb=5b4a76f5a670626f5ae20714d265b3a50ffa2218;hp=dbe3c05166666dee7d8bde669344e1da35b4cb3f;hpb=7f62d92753e6a3e7f4f15093fb959dcb785d6c46;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index dbe3c051..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/02/04 16:51:36 $ - Version: $Revision: 1.44 $ + 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 @@ -20,6 +20,8 @@ #include "gdcmUtil.h" #include +#include +#include //stat function #ifdef _MSC_VER #include @@ -27,10 +29,9 @@ #else #include #include - #include #endif -namespace gdcm +namespace gdcm { //----------------------------------------------------------------------------- // Constructor / Destructor @@ -61,13 +62,20 @@ DirList::~DirList() */ bool DirList::IsDirectory(std::string const &dirName) { -#ifndef _MSC_VER - struct stat buf; - stat(dirName.c_str(), &buf); - return S_ISDIR(buf.st_mode); + 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 (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0; + return S_ISDIR(fs.st_mode); #endif + } + else + { + return false; + } } //----------------------------------------------------------------------------- @@ -91,13 +99,13 @@ int DirList::Explore(std::string const &dirpath, bool recursive) HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData); for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b; - b = FindNextFile(hFile,&fileData)) + 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); } @@ -121,24 +129,24 @@ 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 - // 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 ( 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); }