X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=98bcde6ebedd6172a82bbcbdb51c7d326e90eecd;hb=3842530aeeb5ab67f9d7b0f1754108fd176ee51a;hp=27441507d026d2d92e4784151adc082eeffa890d;hpb=674aea3f45196f37b1107fb7cf17fb7ffbcdf15f;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 27441507..98bcde6e 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:30:26 $
-  Version:   $Revision: 1.48 $
+  Date:      $Date: 2005/07/12 14:58:26 $
+  Version:   $Revision: 1.52 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -21,6 +21,7 @@
 
 #include <iterator>
 #include <assert.h>
+#include <sys/stat.h>  //stat function
 
 #ifdef _MSC_VER
    #include <windows.h> 
@@ -28,10 +29,9 @@
 #else
    #include <dirent.h>   
    #include <sys/types.h>
-   #include <sys/stat.h>
 #endif
 
-namespace gdcm 
+namespace gdcm
 {
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -64,7 +64,7 @@ bool DirList::IsDirectory(std::string const &dirName)
 {
   struct stat fs;
   assert( dirName[dirName.size()-1] != '/' );
-  if(stat(dirName.c_str(), &fs) == 0)
+  if ( stat(dirName.c_str(), &fs) == 0 )
     {
 #if _WIN32
     return ((fs.st_mode & _S_IFDIR) != 0);
@@ -102,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);
          }
@@ -129,7 +129,7 @@ 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
+   // 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.
 
@@ -139,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 also skip hidden files
          {
             numberOfFiles += Explore( fileName, recursive);
          }