BUG: Trying to debug jasper...

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 80c04847e74c972577337d5ee78f55ac42689080..be14a0d4e69fece5d5120ec4f07975cfb18a5850 100644 (file)
--- 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/25 15:49:55 $
-  Version:   $Revision: 1.46 $
+  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,10 +29,9 @@
 #else
    #include <dirent.h>   
    #include <sys/types.h>
-   #include <sys/stat.h>
 #endif
 
-namespace gdcm 
+namespace gdcm
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -61,13 +62,20 @@ DirList::~DirList()
  */
 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
+    {
+    return false;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -94,10 +102,10 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
        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);
          }
@@ -131,14 +139,14 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    {
       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);
          }