From 5dc31f3b74c8da7f8c59caa4d2255d1d0e7a03d2 Mon Sep 17 00:00:00 2001 From: malaterre Date: Fri, 15 Apr 2005 21:21:42 +0000 Subject: [PATCH] BUG: Attempt to fix borland IsDirectory --- src/gdcmDirList.cxx | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 80c04847..be62fcf1 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/02/25 15:49:55 $ - Version: $Revision: 1.46 $ + Date: $Date: 2005/04/15 21:21:42 $ + Version: $Revision: 1.47 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -61,13 +61,19 @@ 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; + 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; + } } //----------------------------------------------------------------------------- -- 2.48.1