aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/source-parser.c12
-rw-r--r--tests/check_source_parser.c72
2 files changed, 82 insertions, 2 deletions
diff --git a/src/source-parser.c b/src/source-parser.c
index 13741bd..b556a3c 100644
--- a/src/source-parser.c
+++ b/src/source-parser.c
@@ -72,8 +72,16 @@ blogc_source_parse(const char *src, size_t src_len, blogc_error_t **err)
break;
if (c == ':') {
key = b_strndup(src + start, current - start);
- if ((0 == strncmp("FILENAME", src + start, current - start)) ||
- (0 == strncmp("CONTENT", src + start, current - start)))
+ if (((current - start == 8) &&
+ (0 == strncmp("FILENAME", src + start, 8))) ||
+ ((current - start == 7) &&
+ (0 == strncmp("CONTENT", src + start, 7))) ||
+ ((current - start == 14) &&
+ (0 == strncmp("DATE_FORMATTED", src + start, 14))) ||
+ ((current - start == 20) &&
+ (0 == strncmp("DATE_FIRST_FORMATTED", src + start, 20))) ||
+ ((current - start == 19) &&
+ (0 == strncmp("DATE_LAST_FORMATTED", src + start, 19))))
{
*err = blogc_error_new_printf(BLOGC_ERROR_SOURCE_PARSER,
"'%s' variable is forbidden in source files. It will "
diff --git a/tests/check_source_parser.c b/tests/check_source_parser.c
index c779ed3..19b3e4c 100644
--- a/tests/check_source_parser.c
+++ b/tests/check_source_parser.c
@@ -190,6 +190,74 @@ test_source_parse_config_reserved_name(void **state)
static void
+test_source_parse_config_reserved_name2(void **state)
+{
+ const char *a = "CONTENT: asd\r\n";
+ blogc_error_t *err = NULL;
+ b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+ assert_null(source);
+ assert_non_null(err);
+ assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
+ assert_string_equal(err->msg,
+ "'CONTENT' variable is forbidden in source files. It will be set "
+ "for you by the compiler.");
+ blogc_error_free(err);
+ b_trie_free(source);
+}
+
+
+static void
+test_source_parse_config_reserved_name3(void **state)
+{
+ const char *a = "DATE_FORMATTED: asd\r\n";
+ blogc_error_t *err = NULL;
+ b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+ assert_null(source);
+ assert_non_null(err);
+ assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
+ assert_string_equal(err->msg,
+ "'DATE_FORMATTED' variable is forbidden in source files. It will be set "
+ "for you by the compiler.");
+ blogc_error_free(err);
+ b_trie_free(source);
+}
+
+
+static void
+test_source_parse_config_reserved_name4(void **state)
+{
+ const char *a = "DATE_FIRST_FORMATTED: asd\r\n";
+ blogc_error_t *err = NULL;
+ b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+ assert_null(source);
+ assert_non_null(err);
+ assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
+ assert_string_equal(err->msg,
+ "'DATE_FIRST_FORMATTED' variable is forbidden in source files. It will be set "
+ "for you by the compiler.");
+ blogc_error_free(err);
+ b_trie_free(source);
+}
+
+
+static void
+test_source_parse_config_reserved_name5(void **state)
+{
+ const char *a = "DATE_LAST_FORMATTED: asd\r\n";
+ blogc_error_t *err = NULL;
+ b_trie_t *source = blogc_source_parse(a, strlen(a), &err);
+ assert_null(source);
+ assert_non_null(err);
+ assert_int_equal(err->type, BLOGC_ERROR_SOURCE_PARSER);
+ assert_string_equal(err->msg,
+ "'DATE_LAST_FORMATTED' variable is forbidden in source files. It will be set "
+ "for you by the compiler.");
+ blogc_error_free(err);
+ b_trie_free(source);
+}
+
+
+static void
test_source_parse_config_value_no_line_ending(void **state)
{
const char *a = "BOLA: asd";
@@ -235,6 +303,10 @@ main(void)
unit_test(test_source_parse_config_no_value),
unit_test(test_source_parse_config_no_value2),
unit_test(test_source_parse_config_reserved_name),
+ unit_test(test_source_parse_config_reserved_name2),
+ unit_test(test_source_parse_config_reserved_name3),
+ unit_test(test_source_parse_config_reserved_name4),
+ unit_test(test_source_parse_config_reserved_name5),
unit_test(test_source_parse_config_value_no_line_ending),
unit_test(test_source_parse_invalid_separator),
};