Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2004/11/23 01:20:18 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2005/11/28 15:20:33 $
+ Version: $Revision: 1.54 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDirList.h"
#include "gdcmUtil.h"
+#include "gdcmDebug.h"
-#include <iostream>
-#include <algorithm>
+#include <iterator>
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h> //stat function
-#if defined(_MSC_VER) || defined (__CYGWIN__) || defined(__BORLANDC__)
- #include <windows.h>
#ifdef _MSC_VER
+ #include <windows.h>
#include <direct.h>
-#endif //_MSC_VER
#else
#include <dirent.h>
- #include <unistd.h>
- #include <sys/stat.h>
#include <sys/types.h>
#endif
-namespace gdcm
+namespace gdcm
{
+//-----------------------------------------------------------------------------
// Constructor / Destructor
/**
- * \ingroup DirList
* \brief Constructor
* @param dirName root directory name
* @param recursive whether we want to explore recursively or not
*/
-DirList::DirList(std::string const & dirName, bool recursive)
+DirList::DirList(std::string const &dirName, bool recursive)
{
- name = dirName;
- Util::NormalizePath(name);
- Explore(name, recursive);
+ DirName = dirName;
+ Explore(dirName, recursive);
}
/**
- * \ingroup DirList
* \brief Destructor
*/
DirList::~DirList()
{
}
-//-----------------------------------------------------------------------------
-// Print
-
//-----------------------------------------------------------------------------
// Public
/**
- * \ingroup DirList
- * \brief Get the directory name
- * @return the directory name
+ * \brief Tells us if file name corresponds to a Directory
+ * @param dirName file name to check
+ * @return true if the file IS a Directory
*/
-std::string const & DirList::GetDirName() const
+bool DirList::IsDirectory(std::string const &dirName)
{
- return name;
+ 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 S_ISDIR(fs.st_mode);
+#endif
+ }
+ else
+ {
+ const char *str = strerror(errno);
+ gdcmStaticErrorMacro( str );
+ return false;
+ }
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
// Private
-
/**
* \brief Explore a directory with possibility of recursion
* return number of files read
* @param dirpath directory to explore
* @param recursive whether we want recursion or not
*/
-int DirList::Explore(std::string const & dirpath, bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive)
{
int numberOfFiles = 0;
std::string fileName;
std::string dirName = Util::NormalizePath(dirpath);
-#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__BORLANDC__)
- WIN32_FIND_DATA fileData;
- HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
- int found = true;
+#ifdef _MSC_VER
+ WIN32_FIND_DATA fileData;
+ assert( dirName[dirName.size()-1] == '/' );
+ 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 )
+ if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
{
- // Is the '.' and '..' usefull ?
- if( fileName != "." && fileName != ".." && recursive )
+ // 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);
+ }
+ DWORD dwError = GetLastError();
+ if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
+ if (dwError != ERROR_NO_MORE_FILES)
+ {
+ gdcmErrorMacro("FindNextFile error. Error is " << dwError);
+ return -1;
}
#else
}
// 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( stat(fileName.c_str(), &buf) != 0 )
+ {
+ const char *str = strerror(errno);
+ gdcmErrorMacro( str );
+ }
+ 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?
+ 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);
}
}
else
{
- // we might need to do a different treament
- //abort();
+ gdcmErrorMacro( "Unexpected error" );
+ return -1;
}
}
- closedir(dir);
+ if( closedir(dir) != 0 )
+ {
+ const char *str = strerror(errno);
+ gdcmErrorMacro( str );
+ }
#endif
return numberOfFiles;
}
-} // end namespace gdcm
//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief Print method
+ * @param os ostream to write to
+ */
+void DirList::Print(std::ostream &os)
+{
+ std::copy(Filenames.begin(), Filenames.end(),
+ std::ostream_iterator<std::string>(os, "\n"));
+}
+
+//-----------------------------------------------------------------------------
+} // end namespace gdcm
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff