X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=4422a0a8434590af61cde2e9517a52ce61e25a22;hb=038a3b7f67769dc20b4c46f3c9dcad7cc63d1161;hp=62d449c6e4e35b097d44b5a862e241727093b8f4;hpb=e362e5566f4388a31bcff8eae74d59664b9c31e6;p=gdcm.git

diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx
index 62d449c6..4422a0a8 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/01/14 22:27:27 $
-  Version:   $Revision: 1.35 $
+  Date:      $Date: 2005/01/18 08:01:41 $
+  Version:   $Revision: 1.39 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -34,7 +34,6 @@ namespace gdcm
 {
 // Constructor / Destructor
 /**
- * \ingroup DirList
  * \brief Constructor  
  * @param  dirName root directory name
  * @param  recursive whether we want to explore recursively or not 
@@ -46,7 +45,6 @@ DirList::DirList(std::string const &dirName, bool recursive)
 }
 
 /**
- * \ingroup DirList
  * \brief  Destructor
  */
 DirList::~DirList()
@@ -57,8 +55,8 @@ DirList::~DirList()
 // Public
 
 /**
- * \ingroup DirList
  * \brief   Print method
+ * @param os ostream to write to 
  */
 void DirList::Print(std::ostream &os)
 {
@@ -84,16 +82,16 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
    std::string fileName;
    std::string dirName = Util::NormalizePath(dirpath);
 #ifdef _MSC_VER
-   WIN32_FIND_DATA fileData; 
-   HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData);
-   int found = true;
+   WIN32_FIND_DATA fileData;
+   HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
 
-   while( hFile != INVALID_HANDLE_VALUE && found )
+   for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
+       b = FindNextFile(hFile,&fileData))
    {
       fileName = fileData.cFileName;
       if( fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY )
       {
-         // Is the '.' and '..' usefull ?
+         // Need to check for . and .. to avoid infinite loop
          if( fileName != "." && fileName != ".." && recursive )
          {
             numberOfFiles += Explore(dirName+fileName,recursive);
@@ -104,9 +102,8 @@ int DirList::Explore(std::string const &dirpath, bool recursive)
          Filenames.push_back(dirName+fileName);
          numberOfFiles++;
       }
-
-      found = FindNextFile(hFile, &fileData);
    }
+   if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
 
 #else
   // Real POSIX implementation: scandir is a BSD extension only, and doesn't 
@@ -120,7 +117,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
-   // terminating null character.  Use of other fields will harm  the  porta-
+   // terminating null character.  Use of other fields will harm the  porta-
    // bility  of  your  programs.
 
    struct stat buf;