diff options
author | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-10-24 21:24:13 +0000 |
---|---|---|
committer | knarf <knarf@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-10-24 21:24:13 +0000 |
commit | 7c6430491d7e8c4dc96f1ff3df1c335f3d423b3b (patch) | |
tree | f16ec8a48c70d3be6cd5a65877e6380beed6bc03 | |
parent | 063313d80652e17e6c49d96e7c2617eca4712453 (diff) |
allow ${parfile} in parameter files to allow ${parfile}/subdir
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4892 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r-- | src/util/ParseFile.c | 8 |
1 files changed, 7 insertions, 1 deletions
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) |