X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=d75662650f83cb090cb68d62368d2332c8368929;hb=e51bf0565bbe4c0e269dd941cb4071ebde6012e4;hp=615d0b4deced7612782941982df26cb9c0c80d02;hpb=62860f80103d156291bfb6e8aaedef6dede7f490;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 615d0b4d..d7566265 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/12 22:09:55 $
-  Version:   $Revision: 1.32 $
+  Date:      $Date: 2005/02/06 14:43:27 $
+  Version:   $Revision: 1.45 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -19,7 +19,7 @@
 #include "gdcmDirList.h"
 #include "gdcmUtil.h"
 
-#include <iostream>
+#include <iterator>
 
 #ifdef _MSC_VER
    #include <windows.h> 
@@ -32,9 +32,9 @@
 
 namespace gdcm 
 {
+//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
- * \ingroup DirList
  * \brief Constructor  
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
@@ -42,31 +42,32 @@ namespace gdcm
 DirList::DirList(std::string const &dirName, bool recursive)
 {
    DirName = dirName;
-   Util::NormalizePath(DirName);
-   Explore(DirName, recursive);
+   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 DirName;
+#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
 }
 
 //-----------------------------------------------------------------------------
@@ -74,7 +75,6 @@ std::string const &DirList::GetDirName() const
 
 //-----------------------------------------------------------------------------
 // Private
-
 /**
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
@@ -87,16 +87,16 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    std::string fileName;
    std::string dirName = Util::NormalizePath(dirpath);
 #ifdef _MSC_VER
-   WIN32_FIND_DATA fileData; 
-   HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
-   int found = true;
+   WIN32_FIND_DATA fileData;
+   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 )
       {
-         // Is the '.' and '..' usefull ?
+         // Need to check for . and .. to avoid infinite loop
          if( fileName != "." && fileName != ".." && recursive )
          {
             numberOfFiles += Explore(dirName+fileName,recursive);
@@ -104,12 +104,11 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
       }
       else
       {
-         push_back(dirName+fileName);
+         Filenames.push_back(dirName+fileName);
          numberOfFiles++;
       }
-
-      found = FindNextFile(hFile, &fileData);
    }
+   if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
 
 #else
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
@@ -122,9 +121,9 @@ 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 preceding the
+   // terminating null character. Use of other fields will harm the  porta-
+   // bility of your programs.
 
    struct stat buf;
    dirent *d = 0;
@@ -134,7 +133,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
       stat(fileName.c_str(), &buf); //really discard output ?
       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?
@@ -155,6 +154,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