Fix bug in windows part

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 005700a72a42f06499352524bad89c62a5dd9dc4..641c11b63935c249baabc10342a306e82577320e 100644 (file)
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/09/20 07:43:35 $
-  Version:   $Revision: 1.64 $
+  Date:      $Date: 2009/05/19 15:04:15 $
+  Version:   $Revision: 1.67 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -28,7 +28,7 @@
 #include <sys/stat.h>  //stat function
 
 #ifdef _MSC_VER
-   #include <windows.h> 
+   #include <windows.h>
    #include <direct.h>
 #else
    #include <dirent.h>   
@@ -44,10 +44,10 @@ namespace GDCM_NAME_SPACE
  * @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, bool all)
 {
    DirName = dirName;
-   Explore(dirName, recursive);
+   Explore(dirName, recursive, all);
 }
 
 /**
@@ -144,15 +144,16 @@ int DirList::Explore(DicomDirSerie *se)
       im = se->GetNextImage();   
    }
    return numberOfFiles;
-}   
+}
    
 /**
  * \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
+ * @param all whether we want all (i.e; File names + Directory names) default=false
  */
-int DirList::Explore(std::string const &dirpath, bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive, bool all)
 {
    int numberOfFiles = 0;
    std::string fileName;
@@ -162,24 +163,42 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    //assert( dirName[dirName.size()-1] == '' );
    HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
-   for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
+   for(BOOL b = (hFile != INVALID_HANDLE_VALUE);
        b = FindNextFile(hFile, &fileData))
    {
-      fileName = fileData.cFileName;
-      if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
+      fileName = dirName + fileData.cFileName;
+      // avoid infinite loop! 
+      if ( GDCM_NAME_SPACE::Util::GetName(fileName) == "." || GDCM_NAME_SPACE::Util::GetName(fileName) == "..")
+         continue;
+
+      if (all)  // meaningfull only when recursive=false
       {
-         // Need to check for . and .. to avoid infinite loop
-         if ( fileName != "." && fileName != ".." && recursive )
-         {
-            numberOfFiles += Explore(dirName+fileName,recursive);
-         }
+         Filenames.push_back( fileName );
+         numberOfFiles++;
       }
       else
       {
-         Filenames.push_back(dirName+fileName);
-         numberOfFiles++;
-      }
+        if ( !( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) )    //is it a regular file?
+        {
+           Filenames.push_back( fileName );
+           numberOfFiles++;
+
+        }
+        else if ( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY ) //directory?
+        {
+           if ( GDCM_NAME_SPACE::Util::GetName(fileName)[0] != '.' && recursive ) //we also skip hidden files
+           {
+              numberOfFiles += Explore( fileName, recursive);
+           }
+        }
+        else
+        {
+           gdcmErrorMacro( "Unexpected error" );
+           return -1;
+        }
+     }
    }
+
    DWORD dwError = GetLastError();
    if (hFile != INVALID_HANDLE_VALUE) 
       FindClose(hFile);
@@ -218,28 +237,43 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    for (d = readdir(dir); d; d = readdir(dir))
    {
       fileName = dirName + d->d_name;
+      //std::cout << d->d_name << std::endl;
+      // avoid infinite loop!  
+      if ( GDCM_NAME_SPACE::Util::GetName(d->d_name) == "." || GDCM_NAME_SPACE::Util::GetName(d->d_name) == "..")
+         continue;      
+      
       if( stat(fileName.c_str(), &buf) != 0 )
       {
          gdcmErrorMacro( strerror(errno) );
       }
-      if ( S_ISREG(buf.st_mode) )    //is it a regular file?
+      
+      if (all)  // meaningfull only when recursive=false
       {
          Filenames.push_back( fileName );
-         numberOfFiles++;
-      }
-      else if ( S_ISDIR(buf.st_mode) ) //directory?
-      {
-         if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files
-         {
-            numberOfFiles += Explore( fileName, recursive);
-         }
+         numberOfFiles++;      
       }
       else
       {
-         gdcmErrorMacro( "Unexpected error" );
-         return -1;
-      }
+        if ( S_ISREG(buf.st_mode) )    //is it a regular file?
+        {
+           Filenames.push_back( fileName );
+           numberOfFiles++;
+        }
+        else if ( S_ISDIR(buf.st_mode) ) //directory?
+        {
+           if ( d->d_name[0] != '.' && recursive ) //we also skip hidden files
+           {
+              numberOfFiles += Explore( fileName, recursive);
+           }
+        }
+        else
+        {
+           gdcmErrorMacro( "Unexpected error" );
+           return -1;
+        }
+     }
    }
+   
    if( closedir(dir) != 0 )
    {
       gdcmErrorMacro( strerror(errno) );