Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2005/02/25 15:49:55 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2005/06/24 10:55:59 $
+ Version: $Revision: 1.51 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmUtil.h"
#include <iterator>
+#include <assert.h>
+#include <sys/stat.h> //stat function
#ifdef _MSC_VER
#include <windows.h>
#else
#include <dirent.h>
#include <sys/types.h>
- #include <sys/stat.h>
#endif
-namespace gdcm
+namespace gdcm
{
//-----------------------------------------------------------------------------
// Constructor / Destructor
*/
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;
+ }
}
//-----------------------------------------------------------------------------
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);
}
{
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 are also skipping hidden files
{
numberOfFiles += Explore( fileName, recursive);
}