ENH: Try to rewrite this nice obfuscated code

[gdcm.git] / src / gdcmDirList.cxx

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 6b95cf8f8b817eddbb63d93fd6e22c3a431df348..8b437783b08703deedc4fccac6e3cbea6359a686 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/02 15:07:41 $
-  Version:   $Revision: 1.43 $
+  Date:      $Date: 2005/05/11 14:40:57 $
+  Version:   $Revision: 1.50 $
                                                                                 
   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
@@ -54,15 +55,27 @@ 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
+    {
+    return false;
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -86,7 +99,7 @@ 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 )
@@ -116,12 +129,12 @@ 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;