From f6421f108d3dcfc8642911482913c1e7454d331b Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 3 Feb 2015 11:59:43 +0000
Subject: [PATCH] POSIX.C findEtcFiles: Revert change to read
system/controlDict Causes problems if the controlDict contains # entries
---
src/OSspecific/POSIX/POSIX.C | 14 +-------------
.../functionEntries/functionEntry/functionEntry.C | 7 ++++---
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index e2ae0a15e01..5374c0b6152 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -277,23 +277,11 @@ Foam::fileNameList Foam::findEtcFiles
{
fileNameList results;
- // Search for user files in ./system
- // Assumes the application is executed in the case directory
- fileName searchDir = "system";
- if (isDir(searchDir))
- {
- fileName fullName = searchDir/name;
- if (isFile(fullName))
- {
- results.append(fullName);
- }
- }
-
// Search for user files in
// * ~/.OpenFOAM/VERSION
// * ~/.OpenFOAM
//
- searchDir = home()/".OpenFOAM";
+ fileName searchDir = home()/".OpenFOAM";
if (isDir(searchDir))
{
fileName fullName = searchDir/FOAMversion/name;
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
index 91bcbb12046..a5378601e75 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/functionEntry/functionEntry.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -62,7 +62,7 @@ bool Foam::functionEntry::execute
if (!executedictionaryIstreamMemberFunctionTablePtr_)
{
- cerr<<"functionEntry::execute"
+ cerr<< "functionEntry::execute"
<< "(const word&, dictionary&, Istream&)"
<< " not yet initialized, function = "
<< functionName.c_str() << std::endl;
@@ -108,7 +108,7 @@ bool Foam::functionEntry::execute
if (!executeprimitiveEntryIstreamMemberFunctionTablePtr_)
{
- cerr<<"functionEntry::execute"
+ cerr<< "functionEntry::execute"
<< "(const word&, const dictionary&, primitiveEntry&, Istream&)"
<< " not yet initialized, function = "
<< functionName.c_str() << std::endl;
@@ -137,4 +137,5 @@ bool Foam::functionEntry::execute
return mfIter()(parentDict, entry, is);
}
+
// ************************************************************************* //
--
GitLab