X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=be14a0d4e69fece5d5120ec4f07975cfb18a5850;hb=2974fc9af7458cd3a94251a12d4af74fefe22275;hp=c605b7b3a137481f3943653a448593ff4b1ba1ba;hpb=ebc807df21ba9e4e7ecae409d875ed46b47cd79c;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index c605b7b3..be14a0d4 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/02/01 09:46:15 $
-  Version:   $Revision: 1.40 $
+  Date:      $Date: 2005/06/24 10:55:59 $
+  Version:   $Revision: 1.51 $
                                                                                 
   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,11 +29,11 @@
 #else
    #include <dirent.h>   
    #include <sys/types.h>
-   #include <sys/stat.h>
 #endif
 
-namespace gdcm 
+namespace gdcm
 {
+//-----------------------------------------------------------------------------
 // Constructor / Destructor
 /**
  * \brief Constructor  
@@ -53,15 +55,27 @@ DirList::~DirList()
 
 //-----------------------------------------------------------------------------
 // Public
-
 /**
- * \brief   Print method
- * @param os ostream to write to 
+ * \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;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -69,7 +83,6 @@ void DirList::Print(std::ostream &os)
 
 //-----------------------------------------------------------------------------
 // Private
-
 /**
  * \brief   Explore a directory with possibility of recursion
  *          return number of files read
@@ -86,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 )
       {
          // Need to check for . and .. to avoid infinite loop
-         if( fileName != "." && fileName != ".." && recursive )
+         if ( fileName != "." && fileName != ".." && recursive )
          {
             numberOfFiles += Explore(dirName+fileName,recursive);
          }
@@ -116,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 preceding 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 are also skipping hidden files
          {
             numberOfFiles += Explore( fileName, recursive);
          }
@@ -150,16 +163,17 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
   return numberOfFiles;
 }
 
-bool DirList::IsDirectory(std::string const &dirName)
+//-----------------------------------------------------------------------------
+// Print
+/**
+ * \brief   Print method
+ * @param os ostream to write to 
+ */
+void DirList::Print(std::ostream &os)
 {
-#ifndef _MSC_VER
-   std::ifstream testDir(dirName.c_str(), std::ios::in | std::ios::binary);
-   return testDir != 0;
-#else
-   return (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0;
-#endif
+   std::copy(Filenames.begin(), Filenames.end(), 
+             std::ostream_iterator<std::string>(os, "\n"));
 }
 
-} // end namespace gdcm
-
 //-----------------------------------------------------------------------------
+} // end namespace gdcm