X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=0600fd16a8e686120c1f775a1f32deda94378038;hb=7350639601914cd8ab02bfb0d6668c5bf56ce2f4;hp=c605b7b3a137481f3943653a448593ff4b1ba1ba;hpb=ebc807df21ba9e4e7ecae409d875ed46b47cd79c;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index c605b7b3..0600fd16 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/01 09:46:15 $ - Version: $Revision: 1.40 $ + Date: $Date: 2005/02/01 10:29:55 $ + Version: $Revision: 1.42 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -32,6 +32,7 @@ namespace gdcm { +//----------------------------------------------------------------------------- // Constructor / Destructor /** * \brief Constructor @@ -53,7 +54,6 @@ DirList::~DirList() //----------------------------------------------------------------------------- // Public - /** * \brief Print method * @param os ostream to write to @@ -69,7 +69,6 @@ void DirList::Print(std::ostream &os) //----------------------------------------------------------------------------- // Private - /** * \brief Explore a directory with possibility of recursion * return number of files read @@ -153,13 +152,16 @@ int DirList::Explore(std::string const &dirpath, bool recursive) bool DirList::IsDirectory(std::string const &dirName) { #ifndef _MSC_VER - std::ifstream testDir(dirName.c_str(), std::ios::in | std::ios::binary); - return testDir != 0; + struct stat buf; + stat(dirName.c_str(), &buf); + return S_ISDIR(buf.st_mode); #else return (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0; #endif } -} // end namespace gdcm +//----------------------------------------------------------------------------- +// Print //----------------------------------------------------------------------------- +} // end namespace gdcm