You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ro...@apache.org on 2007/02/22 19:20:06 UTC
svn commit: r510612 -
/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
Author: robbinspg
Date: Thu Feb 22 10:20:05 2007
New Revision: 510612
URL: http://svn.apache.org/viewvc?view=rev&rev=510612
Log:
Correct extension loading on WIndows
Modified:
incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
Modified: incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp
URL: http://svn.apache.org/viewvc/incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp?view=diff&rev=510612&r1=510611&r2=510612
==============================================================================
--- incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp (original)
+++ incubator/tuscany/cpp/sca/runtime/core/src/tuscany/sca/util/File.cpp Thu Feb 22 10:20:05 2007
@@ -94,13 +94,12 @@
#if defined(WIN32) || defined (_WINDOWS)
char currentDir[ _MAX_FNAME];
-
GetCurrentDirectory(_MAX_FNAME, currentDir);
// Set current directory, from which to search.
if (!SetCurrentDirectory(rootDir.c_str()))
{
- cout << "Unable to set current directory to: " << rootDir.c_str() << endl;
+ loginfo("Unable to set current directory to: %s", rootDir.c_str());
return;
}
char fullDirname[ _MAX_FNAME];
@@ -123,7 +122,7 @@
// Skip over directories
if (!(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) )
{
- if (directories)
+ if (!directories)
{
// Add the file to our list
files.push_back(File(fullDirname, data.cFileName));
@@ -159,7 +158,7 @@
if ((strcmp(data.cFileName, ".")) && (strcmp("..", data.cFileName)))
{
// Recurse
- findFiles(data.cFileName, pattern, subdirectories);
+ findFiles(data.cFileName, pattern, subdirectories, directories);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org