From 717a3e596ad1a2015177b0212b9b48f905abc8cb Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Tue, 9 Jul 2019 18:04:23 +0200
Subject: [PATCH] CONFIG: always allow spaces in fileName for Windows (#1238)
- this cannot be left as a configurable value (on windows), since it
needs to be enabled even prior to reading the etc/controlDict file,
in case the OpenFOAM installation path itself contains spaces.
---
etc/controlDict | 4 ++--
src/OpenFOAM/primitives/strings/fileName/fileName.C | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/etc/controlDict b/etc/controlDict
index 9a7a850176..5be9a11664 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -68,8 +68,8 @@ InfoSwitches
allowSystemOperations 1;
// Allow space character in fileName (use with caution)
- // Default: 0 for non-Windows, 1 for Windows
- //// allowSpaceInFileName 0;
+ // Ignored (always 1) for Windows.
+ allowSpaceInFileName 0;
}
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 0027a6367a..d43f71853b 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -42,7 +42,7 @@ int Foam::fileName::debug(Foam::debug::debugSwitch(fileName::typeName, 0));
int Foam::fileName::allowSpaceInFileName
(
#ifdef _WIN32
- Foam::debug::infoSwitch("allowSpaceInFileName", 1)
+ 1 // Windows: expect spaces to occur
#else
Foam::debug::infoSwitch("allowSpaceInFileName", 0)
#endif
--
GitLab