From 7c6430491d7e8c4dc96f1ff3df1c335f3d423b3b Mon Sep 17 00:00:00 2001
From: knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac>
Date: Wed, 24 Oct 2012 21:24:13 +0000
Subject: allow ${parfile} in parameter files to allow ${parfile}/subdir

git-svn-id: http://svn.cactuscode.org/flesh/trunk@4892 17b73243-c579-4c4c-a9d2-2d5706c11dac
---
 src/util/ParseFile.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/util')

diff --git a/src/util/ParseFile.c b/src/util/ParseFile.c
index ed1ff431..a80e1df8 100644
--- a/src/util/ParseFile.c
+++ b/src/util/ParseFile.c
@@ -430,7 +430,8 @@ static char *ParseDefines(char *buffer, unsigned long *buffersize)
           if (pos+1 < *buffersize) { pos++; }
         }
         /* Parameter file name ? */
-        else if (strcmp(define, "parfile") == 0)
+        else if ((strcmp(define, "parfile") == 0) ||
+                 (strcmp(define, "{parfile") == 0))
         {
           char path[500];
           CCTK_ParameterFilename(500, path);
@@ -448,6 +449,11 @@ static char *ParseDefines(char *buffer, unsigned long *buffersize)
           {
             value[strlen (value) - 4] = '\0';
           }
+          if (define[0] == '{')
+          {
+            /* increase pos to jump over the trailing } */
+            if (pos+1 < *buffersize) { pos++; }
+          }
         }
         /* Else: unknown define - or no define at all: ignore */
         if (value)
-- 
cgit v1.2.3