Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2005/01/14 21:52:06 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2005/01/18 08:01:41 $
+ Version: $Revision: 1.39 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
{
// Constructor / Destructor
/**
- * \ingroup DirList
* \brief Constructor
* @param dirName root directory name
* @param recursive whether we want to explore recursively or not
}
/**
- * \ingroup DirList
* \brief Destructor
*/
DirList::~DirList()
{
}
-//-----------------------------------------------------------------------------
-// Print
-
//-----------------------------------------------------------------------------
// Public
+
/**
- * \ingroup DirList
- * \brief Get the directory name
- * @return the directory name
+ * \brief Print method
+ * @param os ostream to write to
*/
-std::string const &DirList::GetDirName() const
-{
- return DirName;
-}
-
void DirList::Print(std::ostream &os)
{
- copy(begin(), end(), std::ostream_iterator<std::string>(os, "\n"));
+ std::copy(Filenames.begin(), Filenames.end(),
+ std::ostream_iterator<std::string>(os, "\n"));
}
//-----------------------------------------------------------------------------
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
// 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-
+ // terminating null character. Use of other fields will harm the porta-
// bility of your programs.
struct stat buf;
stat(fileName.c_str(), &buf); //really discard output ?
if( S_ISREG(buf.st_mode) ) //is it a regular file?
{
- push_back( fileName );
+ Filenames.push_back( fileName );
numberOfFiles++;
}
else if( S_ISDIR(buf.st_mode) ) //directory?