Program: gdcm
Module: $RCSfile: gdcmDirList.cxx,v $
Language: C++
- Date: $Date: 2005/11/29 17:21:34 $
- Version: $Revision: 1.56 $
+ Date: $Date: 2006/05/12 09:36:09 $
+ Version: $Revision: 1.59 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
bool DirList::IsDirectory(std::string const &dirName)
{
struct stat fs;
- assert( dirName[dirName.size()-1] != '/' );
+ // std::cout << "dirName[dirName.size()-1] [" << dirName[dirName.size()-1] << "]"
+ // << std::endl;
+ //assert( dirName[dirName.size()-1] != GDCM_FILESEPARATOR );
if ( stat(dirName.c_str(), &fs) == 0 )
{
#if _WIN32
}
else
{
- const char *str = strerror(errno);
- gdcmStaticErrorMacro( str );
+ gdcmStaticErrorMacro( strerror(errno) );
return false;
}
}
std::string dirName = Util::NormalizePath(dirpath);
#ifdef _MSC_VER
WIN32_FIND_DATA fileData;
- assert( dirName[dirName.size()-1] == '/' );
+ //assert( dirName[dirName.size()-1] == '' );
HANDLE hFile = FindFirstFile((dirName+"*").c_str(), &fileData);
for(BOOL b = (hFile != INVALID_HANDLE_VALUE); b;
}
}
DWORD dwError = GetLastError();
- if (hFile != INVALID_HANDLE_VALUE) FindClose(hFile);
+ if (hFile != INVALID_HANDLE_VALUE)
+ FindClose(hFile);
if (dwError != ERROR_NO_MORE_FILES)
{
- gdcmErrorMacro("FindNextFile error. Error is " << dwError);
+ LPVOID lpMsgBuf;
+ FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|
+ FORMAT_MESSAGE_FROM_SYSTEM|
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,GetLastError(),
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
+ (LPTSTR) &lpMsgBuf,0,NULL);
+
+ gdcmErrorMacro("FindNextFile error. Error is " << (char *)lpMsgBuf
+ <<" for the directory : "<<dirName);
return -1;
}
fileName = dirName + d->d_name;
if( stat(fileName.c_str(), &buf) != 0 )
{
- const char *str = strerror(errno);
- gdcmErrorMacro( str );
+ gdcmErrorMacro( strerror(errno) );
}
if ( S_ISREG(buf.st_mode) ) //is it a regular file?
{
}
if( closedir(dir) != 0 )
{
- const char *str = strerror(errno);
- gdcmErrorMacro( str );
+ gdcmErrorMacro( strerror(errno) );
}
#endif