X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=be14a0d4e69fece5d5120ec4f07975cfb18a5850;hb=8ec2c436833d0ee32de2bd0128045f859cf8d1eb;hp=be62fcf1428219caef9b1cb23e33566148c1bc48;hpb=5dc31f3b74c8da7f8c59caa4d2255d1d0e7a03d2;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index be62fcf1..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/04/15 21:21:42 $
-  Version:   $Revision: 1.47 $
+  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
@@ -62,7 +63,8 @@ DirList::~DirList()
 bool DirList::IsDirectory(std::string const &dirName)
 {
   struct stat fs;
-  if(stat(dirName.c_str(), &fs) == 0)
+  assert( dirName[dirName.size()-1] != '/' );
+  if ( stat(dirName.c_str(), &fs) == 0 )
     {
 #if _WIN32
     return ((fs.st_mode & _S_IFDIR) != 0);
@@ -100,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);
          }
@@ -137,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);
          }