X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=d4d0c2db649b3e269fce44ef13a4ff99b5ade0d1;hb=0fd97a2f44764117b637de53e09b8a329ca133f8;hp=e3a00ccce225bb5f5370a537021fed66ee66f0de;hpb=854ec81bfcffd6f0e5939789b0ffbc410f7910b7;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index e3a00ccc..d4d0c2db 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -1,5 +1,21 @@
-// gdcmDirList.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDirList.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/10/27 23:03:07 $
+  Version:   $Revision: 1.25 $
+                                                                                
+  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"
 
@@ -14,27 +30,31 @@
 #else
    #include <dirent.h>   
    #include <unistd.h>
+   #include <sys/stat.h>
+   #include <sys/types.h>
 #endif
 
+namespace gdcm 
+{
 // Constructor / Destructor
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \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);
+   name = dirName;
+   Util::NormalizePath(name);
+   Explore(name, recursive);
 }
 
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief  Destructor
  */
-gdcmDirList::~gdcmDirList(void)
+DirList::~DirList()
 {
 }
 
@@ -44,13 +64,13 @@ gdcmDirList::~gdcmDirList(void)
 //-----------------------------------------------------------------------------
 // Public
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief   Get the directory name
  * @return the directory name 
  */
-std::string gdcmDirList::GetDirName(void)
+std::string const & DirList::GetDirName() const
 {
-   return(name);
+   return name;
 }
 
 //-----------------------------------------------------------------------------
@@ -60,63 +80,86 @@ std::string gdcmDirList::GetDirName(void)
 // Private
 
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief   Explore a directory with possibility of recursion
+ *          return number of files read
  * @param  dirName 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;
-
-   NormalizePath(dirName);
-#if defined(_MSC_VER) || (__CYGWIN__)
+   std::string dirName = Util::NormalizePath(dirpath);
+#if defined(_MSC_VER) || defined(__CYGWIN__)
    WIN32_FIND_DATA fileData; 
    HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
-   int found=true;
+   int found = true;
 
-   while( (hFile!=INVALID_HANDLE_VALUE) && (found) )
+   while( hFile != INVALID_HANDLE_VALUE && found )
    {
-      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);
+         // Is the '.' and '..' usefull ?
+         if( fileName != "." && fileName != ".." && recursive )
+         {
+            numberOfFiles += Explore(dirName+fileName,recursive);
+         }
       }
       else
       {
-         this->push_back(dirName+fileName);
+         push_back(dirName+fileName);
+         numberOfFiles++;
       }
 
-      found=FindNextFile(hFile,&fileData);
+      found = FindNextFile(hFile,&fileData);
    }
 
 #else
-   // None  of  these  functions  is  in  POSIX.  The functions scandir() and
-   // alphasort() are from BSD 4.3, and have been available under Linux since
-   // libc4.  Libc4 and libc5 use the more precise prototype
+  // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
+  // work on debian for example
 
-   struct dirent **namelist;
-   int n=scandir(dirName.c_str(), &namelist, 0, alphasort);
+   DIR* dir = opendir(dirName.c_str());
+   if (!dir)
+   {
+      return 0;
+   }
 
-   //if n < 0 should raise error
+   // 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.
 
-   for (int i= 0;i < n; i++) 
+   struct stat buf;
+   dirent* d = 0;
+   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?
+      {
+         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();
       }
-      free(namelist[i]);
    }
-   free(namelist);
+  closedir(dir);
 #endif
+
+  return numberOfFiles;
 }
+} // end namespace gdcm
 
 //-----------------------------------------------------------------------------