X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=98bcde6ebedd6172a82bbcbdb51c7d326e90eecd;hb=e70a7e5ba954ce367c4b1bce03f6c7065cd45edf;hp=7f347586795e932b2300ff9feda21c3782d2ddec;hpb=4e6b40ac124483ba555714c58836aff9691df125;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 7f347586..98bcde6e 100644
--- a/src/gdcmDirList.cxx
+++ b/src/gdcmDirList.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDirList.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/01/14 22:53:58 $
-  Version:   $Revision: 1.37 $
+  Date:      $Date: 2005/07/12 14:58:26 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,6 +20,8 @@
 #include "gdcmUtil.h"
 
 #include <iterator>
+#include <assert.h>
+#include <sys/stat.h>  //stat function
 
 #ifdef _MSC_VER
    #include <windows.h> 
@@ -27,14 +29,13 @@
 #else
    #include <dirent.h>   
    #include <sys/types.h>
-   #include <sys/stat.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 
@@ -46,7 +47,6 @@ DirList::DirList(std::string const &dirName, bool recursive)
 }
 
 /**
- * \ingroup DirList
  * \brief  Destructor
  */
 DirList::~DirList()
@@ -55,15 +55,27 @@ DirList::~DirList()
 
 //-----------------------------------------------------------------------------
 // Public
-
 /**
- * \ingroup DirList
- * \brief   Print method
+ * \brief Tells us if file name corresponds to a Directory   
+ * @param  dirName file name to check
+ * @return true if the file IS a Directory
  */
-void DirList::Print(std::ostream &os)
+bool DirList::IsDirectory(std::string const &dirName)
 {
-   std::copy(Filenames.begin(), Filenames.end(), 
-             std::ostream_iterator<std::string>(os, "\n"));
+  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
+    {
+    return false;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -71,7 +83,6 @@ void DirList::Print(std::ostream &os)
 
 //-----------------------------------------------------------------------------
 // Private
-
 /**
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
@@ -88,13 +99,13 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
    for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
-       b = FindNextFile(hFile,&fileData))
+       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);
          }
@@ -118,24 +129,24 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    }
 
    // 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 ( S_ISREG(buf.st_mode) )    //is it a regular file?
       {
          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);
          }
@@ -151,6 +162,18 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
 
   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