X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=9bfa68fdde9fa60f38b55b8550dbf3550c20d4d2;hb=1b20e56c29494e7d1bef31d3ade5de833347c228;hp=6b95cf8f8b817eddbb63d93fd6e22c3a431df348;hpb=ff8631dd8488e6604df635faf472ee85f5b8a4b6;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 6b95cf8f..9bfa68fd 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/02 15:07:41 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/11/28 17:24:21 $
+  Version:   $Revision: 1.55 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -18,8 +18,12 @@
 
 #include "gdcmDirList.h"
 #include "gdcmUtil.h"
+#include "gdcmDebug.h"
 
 #include <iterator>
+#include <assert.h>
+#include <errno.h>
+#include <sys/stat.h>  //stat function
 
 #ifdef _MSC_VER
    #include <windows.h> 
@@ -27,10 +31,9 @@
 #else
    #include <dirent.h>   
    #include <sys/types.h>
-   #include <sys/stat.h>
 #endif
 
-namespace gdcm 
+namespace gdcm
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -54,15 +57,29 @@ DirList::~DirList()
 
 //-----------------------------------------------------------------------------
 // Public
+/**
+ * \brief Tells us if file name corresponds to a Directory   
+ * @param  dirName file name to check
+ * @return true if the file IS a Directory
+ */
 bool DirList::IsDirectory(std::string const &dirName)
 {
-#ifndef _MSC_VER
-   struct stat buf;
-   stat(dirName.c_str(), &buf);
-   return S_ISDIR(buf.st_mode);
+   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 (GetFileAttributes(dirName.c_str()) & FILE_ATTRIBUTE_DIRECTORY) != 0;
+      return S_ISDIR(fs.st_mode);
 #endif
+   }
+   else
+   {
+      const char *str = strerror(errno);
+      gdcmStaticErrorMacro( str );
+      return false;
+   }
 }
 
 //-----------------------------------------------------------------------------
@@ -83,16 +100,17 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    std::string dirName = Util::NormalizePath(dirpath);
 #ifdef _MSC_VER
    WIN32_FIND_DATA fileData;
+   assert( dirName[dirName.size()-1] == '/' );
    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);
          }
@@ -103,7 +121,13 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
          numberOfFiles++;
       }
    }
+   DWORD dwError = GetLastError();
    if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
+   if (dwError != ERROR_NO_MORE_FILES) 
+   {
+      gdcmErrorMacro("FindNextFile error. Error is " << dwError);
+      return -1;
+   }
 
 #else
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
@@ -116,35 +140,43 @@ 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( stat(fileName.c_str(), &buf) != 0 )
+      {
+         const char *str = strerror(errno);
+         gdcmErrorMacro( str );
+      }
+      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);
          }
       }
       else
       {
-         // we might need to do a different treament
-         //abort();
+         gdcmErrorMacro( "Unexpected error" );
+         return -1;
       }
    }
-  closedir(dir);
+   if( closedir(dir) != 0 )
+   {
+      const char *str = strerror(errno);
+      gdcmErrorMacro( str );
+   }
 #endif
 
   return numberOfFiles;
@@ -156,7 +188,7 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
  * \brief   Print method
  * @param os ostream to write to 
  */
-void DirList::Print(std::ostream &os)
+void DirList::Print(std::ostream &os, std::string const &indent)
 {
    std::copy(Filenames.begin(), Filenames.end(), 
              std::ostream_iterator<std::string>(os, "\n"));