diff options
author | Danny van Kooten <dannyvankooten@users.noreply.github.com> | 2020-12-03 11:00:25 +0100 |
---|---|---|
committer | Danny van Kooten <dannyvankooten@users.noreply.github.com> | 2020-12-03 11:00:25 +0100 |
commit | a8b907760bab503b99edb1fd832d29d409d125a3 (patch) | |
tree | 4937cdf7e36db022f31a4a1b26370a1be1656688 | |
parent | 5dd30eea54d5b1ef25e517505c5a47ff1a37c424 (diff) | |
download | unja-a8b907760bab503b99edb1fd832d29d409d125a3.tar.gz unja-a8b907760bab503b99edb1fd832d29d409d125a3.zip |
fix inheritance not working because of read_file not populating memory correctly
-rw-r--r-- | src/template.c | 5 | ||||
-rw-r--r-- | tests/data/inheritance-depth-1/one.tmpl | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/template.c b/src/template.c index 6949068..105a8c3 100644 --- a/src/template.c +++ b/src/template.c @@ -197,6 +197,9 @@ struct env *env_new(char *dirname) { strcpy(name, de->d_name); char *tmpl = read_file(name); + #if DEBUG + printf("Parsing template from file %s: %s\n", name, tmpl); + #endif mpc_ast_t *ast = parse(tmpl); free(tmpl); @@ -242,7 +245,7 @@ char *read_file(char *filename) { } unsigned int read = 0; - while ( (read = fread(input, 1, BUFSIZ, f)) > 0) { + while ( (read = fread(input + read, 1, BUFSIZ, f)) > 0) { size += read; input = realloc(input, size + BUFSIZ); } diff --git a/tests/data/inheritance-depth-1/one.tmpl b/tests/data/inheritance-depth-1/one.tmpl index 05467a6..b900bcf 100644 --- a/tests/data/inheritance-depth-1/one.tmpl +++ b/tests/data/inheritance-depth-1/one.tmpl @@ -2,4 +2,4 @@ {% block content %} Child content -{% endblock %}
\ No newline at end of file +{% endblock %} |