Implements logline subst + tests

src/include/ttail_search.h

@@ -81,7 +81,7 @@ int ttail_logline2date(ttail_t*, const char*, struct tm*);
 /**@brief Apply the choosen substitution to the logline
  *@param ttail_t* ttail
  *@param const char* logline
- *@return a pointer on the end of the subst string
+ *@return a pointer on the end of the subst string or NULL if subst fails
  */
 const char* ttail_logline_subst(ttail_t*, const char*);
 

src/ttail_init.c

@@ -252,7 +252,7 @@ int ttail_set_prefix(ttail_t* res, const char* regex)
 	{
 		cflags |= REG_ICASE;
 	}
-	ret = regcomp(&res->date_prefix, regex, 0);
+	ret = regcomp(&res->date_prefix, regex, cflags);
 	if(!ret)
 	{
 		return 0;

src/ttail_search.c

@@ -32,7 +32,27 @@ int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
 	return 0;
 }
 
-const char* ttail_logline_subst(ttail_t* ttail, const char* logline)
+const char* ttail_logline_subst(ttail_t* t, const char* logline)
 {
-	return logline;
+	regmatch_t pmatch[1];
+	size_t nmatch;
+	int ret;
+	char err[1024];
+
+	if(t->prefix_sz >= 0)
+	{
+		/* constant subst */
+		return strlen(logline) < t->prefix_sz ? \
+			NULL:logline + t->prefix_sz;
+	}
+	/* regex subst */
+	nmatch=1;
+	ret = regexec(&(t->date_prefix), logline, nmatch, pmatch, 0);\
+	if(ret)
+	{
+		regerror(ret, &(t->date_prefix), err,1024);
+		fprintf(stderr, "Exec error : %s\n", err);
+		return NULL;
+	}
+	return logline + pmatch[0].rm_eo;
 }

tests/ttail_search_check.c

@@ -168,13 +168,80 @@ START_TEST (test_file_minmax1)
 }
 END_TEST
 
-Suite * ttail_search_suite(void)
+START_TEST (test_search_subst_const1)
+{
+	char expl[] = "Hello world !";
+	const char *res;
+	ttail->flag |= TTAIL_FLAG_PREFIX;
+	ttail->prefix_sz = 4;
+	res = ttail_logline_subst(ttail, expl);
+	ck_assert(res != NULL);
+	ck_assert(res == expl+4);
+}
+END_TEST
+
+START_TEST (test_search_subst_const2)
+{
+	char expl[] = "Hello world !";
+	const char *res;
+	ttail->flag |= TTAIL_FLAG_PREFIX;
+	ttail->prefix_sz = 0;
+	res = ttail_logline_subst(ttail, expl);
+	ck_assert(res != NULL);
+	ck_assert(res == expl);
+}
+END_TEST
+
+START_TEST (test_search_subst_re1)
+{
+	char expl[] = "1337 Foo Bar - Hello world !";
+	char re[] = "^1337 Fo* Bar - ";
+	const char *res;
+	int ret;
+	ret = ttail_set_prefix(ttail, re);
+	ck_assert_int_eq(ret,0);
+	res = ttail_logline_subst(ttail, expl);
+	ck_assert(res != NULL);
+	ck_assert_str_eq(res, "Hello world !");
+}
+END_TEST
+
+START_TEST (test_search_subst_re2)
+{
+	char expl[] = "1337 Foo Bar - Hello world !";
+	char re[] = "^[0-9]+ Fo{2} Bar - ";
+	const char *res;
+	int ret;
+	ttail->flag |= TTAIL_FLAG_EXTENDED_RE;
+	ret = ttail_set_prefix(ttail, re);
+	ck_assert_int_eq(ret,0);
+	res = ttail_logline_subst(ttail, expl);
+	ck_assert(res != NULL);
+	ck_assert_str_eq(res, "Hello world !");
+}
+END_TEST
+
+START_TEST (test_search_subst_re_nomatch)
+{
+	char expl[] = "1337 Foo Bar - Hello world !";
+	char re[] = "Never match m*";
+	const char *res;
+	int ret;
+	ret = ttail_set_prefix(ttail, re);
+	ck_assert_int_eq(ret,0);
+	res = ttail_logline_subst(ttail, expl);
+	ck_assert(res == NULL);
+}
+END_TEST
+
+Suite * ttail_search_files_suite(void)
 {
 	Suite *s;
+	TCase *tc_search_subst;
 	TCase *tc_search_closest_fileinit, *tc_file_line,
 		*tc_file_minmax;
 
-	s = suite_create("ttail search checks");
+	s = suite_create("ttail search_files checks");
 	tc_search_closest_fileinit = tcase_create("\
 ttail_logline_closest_files_init() checks");
 	tcase_add_checked_fixture(tc_search_closest_fileinit,
@@ -196,6 +263,16 @@ ttail_logline_closest_files_init() checks");
 		setup_closest_fileinit, teardown_closest_fileinit);
 	tcase_add_test(tc_file_minmax, test_file_minmax1);
 
+	tc_search_subst = tcase_create("ttail_logline_subst() checks");
+	tcase_add_checked_fixture(tc_search_subst,
+		setup_closest_fileinit, teardown_closest_fileinit);
+	tcase_add_test(tc_search_subst, test_search_subst_const1);
+	tcase_add_test(tc_search_subst, test_search_subst_const2);
+	tcase_add_test(tc_search_subst, test_search_subst_re1);
+	tcase_add_test(tc_search_subst, test_search_subst_re2);
+	tcase_add_test(tc_search_subst, test_search_subst_re_nomatch);
+
+	suite_add_tcase(s, tc_search_subst);
 	suite_add_tcase(s, tc_search_closest_fileinit);
 	suite_add_tcase(s, tc_file_line);
 	suite_add_tcase(s, tc_file_minmax);
@@ -209,9 +286,8 @@ int main(int argc, char **argv)
 
 	chdir(dirname(argv[0])); /* move in ./tests dir */
 
-	sr = srunner_create(ttail_search_suite());
+	sr = srunner_create(ttail_search_files_suite());
 	srunner_set_fork_status(sr, CK_FORK);
-
 	srunner_run_all(sr,CK_VERBOSE);
 	number_failed = srunner_ntests_failed(sr);
 	srunner_free(sr);