Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2005/01/14 22:20:11 $
- Version: $Revision: 1.34 $
+ Date: $Date: 2005/01/14 23:51:40 $
+ Version: $Revision: 1.38 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::string fileName;
std::string dirName = Util::NormalizePath(dirpath);
#ifdef _MSC_VER
- WIN32_FIND_DATA fileData;
- HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
- int found = true;
+ WIN32_FIND_DATA fileData;
+ 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 )
{
- // Is the '.' and '..' usefull ?
+ // 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);
}
+ if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
#else
// Real POSIX implementation: scandir is a BSD extension only, and doesn't