generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 10:09:36 +02:00
Code Issues Projects Releases Wiki Activity

trunk: backport eventing from 1.4.3

Browse Source
This commit is contained in:
Marian Krivos
2012-02-05 12:16:58 +00:00
parent 59fe68edbe
commit 7d7c02c579
412 changed files with 3564 additions and 3634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Foundation/src/Glob.cpp
View File

@@ -1,7 +1,7 @@
//
// Glob.cpp
//
// $Id: //poco/1.3/Foundation/src/Glob.cpp#3 $
// $Id: //poco/1.4/Foundation/src/Glob.cpp#2 $
//
// Library: Foundation
// Package: Filesystem
@@ -259,20 +259,20 @@ void Glob::collect(const Path& pathPattern, const Path& base, const Path& curren
bool Glob::isDirectory(const Path& path, bool followSymlink)
{
File f(path);
bool isDir = false;
try
{
isDir = f.isDirectory();
}
catch (Poco::Exception&)
{
return false;
}
if (isDir)
{
return true;
}
File f(path);
bool isDir = false;
try
{
isDir = f.isDirectory();
}
catch (Poco::Exception&)
{
return false;
}
if (isDir)
{
return true;
}
else if (followSymlink && f.isLink())
{
try