X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=80c04847e74c972577337d5ee78f55ac42689080;hb=d2d88279289bcafbeca8a41934d514d58141376d;hp=ddbc63429bc4204c6811d569e03632e26398725b;hpb=cdc3f89e3291dfdc5cfa60dea19558635d2f8755;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index ddbc6342..80c04847 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -1,57 +1,73 @@
-// gdcmDirList.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDirList.cxx,v $
+  Language:  C++
+  Date:      $Date: 2005/02/25 15:49:55 $
+  Version:   $Revision: 1.46 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #include "gdcmDirList.h"
 #include "gdcmUtil.h"
 
-#include <iostream>
-#include <algorithm>
+#include <iterator>
 
-#if defined(_MSC_VER) || defined (__CYGWIN__)
-   #include <windows.h> 
 #ifdef _MSC_VER
+   #include <windows.h> 
    #include <direct.h>
-#endif //_MSC_VER
 #else
    #include <dirent.h>   
-   #include <unistd.h>
+   #include <sys/types.h>
+   #include <sys/stat.h>
 #endif
 
+namespace gdcm 
+{
+//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup gdcmDirList
  * \brief Constructor  
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
  */
-gdcmDirList::gdcmDirList(std::string dirName,bool recursive)
+DirList::DirList(std::string const &dirName, bool recursive)
 {
-   name=dirName;
-
-   NormalizePath(name);
-   Explore(name,recursive);
+   DirName = dirName;
+   Explore(dirName, recursive);
 }
 
 /**
- * \ingroup gdcmDirList
  * \brief  Destructor
  */
-gdcmDirList::~gdcmDirList(void)
+DirList::~DirList()
 {
 }
 
-//-----------------------------------------------------------------------------
-// Print
-
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmDirList
- * \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 gdcmDirList::GetDirName(void)
+bool DirList::IsDirectory(std::string const &dirName)
 {
-   return(name);
+#ifndef _MSC_VER
+   struct stat buf;
+   stat(dirName.c_str(), &buf);
+   return S_ISDIR(buf.st_mode);
+#else
+   return (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0;
+#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -59,58 +75,97 @@ std::string gdcmDirList::GetDirName(void)
 
 //-----------------------------------------------------------------------------
 // Private
-
 /**
- * \ingroup gdcmDirList
  * \brief   Explore a directory with possibility of recursion
- * @param  dirName directory to explore
+ *          return number of files read
+ * @param  dirpath   directory to explore
  * @param  recursive whether we want recursion or not
  */
-void gdcmDirList::Explore(std::string dirName,bool recursive)
+int DirList::Explore(std::string const &dirpath, bool recursive)
 {
+   int numberOfFiles = 0;
    std::string fileName;
+   std::string dirName = Util::NormalizePath(dirpath);
+#ifdef _MSC_VER
+   WIN32_FIND_DATA fileData;
+   HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
-   NormalizePath(dirName);
-
-#if defined(_MSC_VER) || (__CYGWIN__)
-   WIN32_FIND_DATA fileData; 
-   HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
-   int found=true;
-
-   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)
+      fileName = fileData.cFileName;
+      if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
       {
-         if( (fileName!=".") && (fileName!="..") && (recursive) )
-            Explore(dirName+fileName,recursive);
+         // Need to check for . and .. to avoid infinite loop
+         if( fileName != "." && fileName != ".." && recursive )
+         {
+            numberOfFiles += Explore(dirName+fileName,recursive);
+         }
       }
       else
       {
-         this->push_back(dirName+fileName);
+         Filenames.push_back(dirName+fileName);
+         numberOfFiles++;
       }
-
-      found=FindNextFile(hFile,&fileData);
    }
+   if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
 
 #else
-   struct dirent **namelist;
-   int n=scandir(dirName.c_str(), &namelist, 0, alphasort);
+  // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
+  // work on debian for example
+
+   DIR* dir = opendir(dirName.c_str());
+   if (!dir)
+   {
+      return 0;
+   }
 
-   for (int i= 0;i < n; i++) 
+   // 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.
+
+   struct stat buf;
+   dirent *d;
+   for (d = readdir(dir); d; d = readdir(dir))
    {
-      fileName=namelist[i]->d_name;
-      if(namelist[i]->d_type==DT_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?
+      {
+         Filenames.push_back( fileName );
+         numberOfFiles++;
+      }
+      else if( S_ISDIR(buf.st_mode) ) //directory?
       {
-         if( (fileName!=".") && (fileName!="..") && (recursive) )
-            Explore(dirName+fileName,recursive);
+         if( d->d_name[0] != '.' && recursive ) //we are also skipping hidden files
+         {
+            numberOfFiles += Explore( fileName, recursive);
+         }
       }
       else
       {
-         this->push_back(dirName+fileName);
+         // we might need to do a different treament
+         //abort();
       }
    }
+  closedir(dir);
 #endif
+
+  return numberOfFiles;
+}
+
+//-----------------------------------------------------------------------------
+// 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