Starting to write ttail_search + tests

src/Makefile.am

@@ -1,5 +1,7 @@
 bin_PROGRAMS = ttail
-noinst_LIBRARIES=libttail.a
+noinst_LIBRARIES=libttail_init.a libttail_search.a
 
-libttail_a_SOURCES = ttail_init.c
-ttail_SOURCES = main.c ttail_init.c
+libttail_init_a_SOURCES = ttail_init.c
+libttail_search_a_SOURCES = ttail_search.c
+libttail_search_a_CFLAGS = @CFLAGS@ -D_NOSTATIC
+ttail_SOURCES = main.c ttail_init.c ttail_search.c

src/include/config.h.in

@@ -1,5 +1,12 @@
 /* src/include/config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* used by libcheck to disable static functions */
+#ifdef _NOSTATIC
+#define _static
+#else
+#define _static static
+#endif
+
 #undef TTAIL_FMT_REGEX
 
 /* Define to 1 if you have the <dlfcn.h> header file. */

src/include/ttail_search.h

@@ -0,0 +1,51 @@
+#ifndef _ttail_init_h__
+#define _ttail_init_h__
+
+#include <string.h>
+#include <time.h>
+#include <regex.h>
+
+#include "config.h"
+#include "ttail.h"
+
+/**@brief Comparison results
+ *
+ * -1 if a < b, 1 if a > b, 0 if a == b, -2 if exception
+ *
+ * If an exception occur, exception flags are set with | on the result.
+ * Exceptions flags are : TTAIL_NODATE_A and TTAIL_NODATE_B
+ */
+typedef int ttail_cmp_res;
+
+/**@brief Loglines comparison function
+ *@param ttail_t* ttail
+ *@param const char* logline a
+ *@param const char* logline b
+ *@return @ref ttail_cmp_res
+ */
+ttail_cmp_res ttail_cmp_loglines(ttail_t*, const char*, const char*);
+
+/**@brief compare a logline to a date
+ *@param ttail_t* ttail
+ *@param const char* logline
+ *@param struct tm* @see time.h
+ *@return @ref ttail_cmp_res
+ */
+ttail_cmp_res ttail_cmp_logline(ttail_t*, const char*, struct tm*);
+
+/**@brief Fetch a date from a logline
+ *@param ttail_t* ttail
+ *@param const char* logline
+ *@param struct tm* tm will be set to extracted date if not NULL
+ *@return 0 if ok, -1 if error
+ */
+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 begining of the subst string
+ */
+_static const char* ttail_logline_subst(ttail_t*, const char*);
+
+#endif

src/ttail_search.c

@@ -0,0 +1,12 @@
+#include "ttail_search.h"
+
+int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
+{
+	ttail_logline_subst(ttail, logline);
+	return 0;
+}
+
+_static const char* ttail_logline_subst(ttail_t* ttail, const char* logline)
+{
+	return logline;
+}

tests/Makefile.am

@@ -1,10 +1,14 @@
-TESTS = ttail_argparse_check ttail_init_check
-check_PROGRAMS = ttail_argparse_check ttail_init_check
+TESTS = ttail_argparse_check ttail_init_check ttail_search_check
+check_PROGRAMS = ttail_argparse_check ttail_init_check ttail_search_check
 
 ttail_argparse_check_SOURCES = ttail_argparse_check.c
 ttail_argparse_check_CFLAGS = @CHECK_CFLAGS@
-ttail_argparse_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@
+ttail_argparse_check_LDADD =  $(top_builddir)/src/libttail_init.a @CHECK_LIBS@
 
 ttail_init_check_SOURCES = ttail_init_check.c
 ttail_init_check_CFLAGS = @CHECK_CFLAGS@
-ttail_init_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@
+ttail_init_check_LDADD =  $(top_builddir)/src/libttail_init.a @CHECK_LIBS@
+
+ttail_search_check_SOURCES = ttail_search_check.c
+ttail_search_check_CFLAGS = @CHECK_CFLAGS@ -D_NOSTATIC
+ttail_search_check_LDADD =  $(top_builddir)/src/libttail_search.a @CHECK_LIBS@

tests/ttail_search_check.c

@@ -0,0 +1,47 @@
+#include <check.h>
+
+#include "ttail.h"
+#include "ttail_search.h"
+
+ttail_t *ttail;
+#define __Fname_sz 5
+#define FNAME_NO_EXIST 0
+#define FNAME_EXIST 1
+
+START_TEST (test_search_subst)
+{
+	ttail_logline_subst(ttail, "Hello world !");
+}
+END_TEST
+
+Suite * ttail_search_suite(void)
+{
+	Suite *s;
+	TCase *tc_search_subst;
+
+	s = suite_create("ttail search checks");
+	tc_search_subst = tcase_create("ttail_logline_subst checks");
+	/*
+	tcase_add_checked_fixture(tc_serch_,
+		setup_ttail_empty, teardown_ttail);
+	*/
+	tcase_add_test(tc_search_subst, test_search_subst);
+
+	suite_add_tcase(s, tc_search_subst);
+	return s;
+}
+
+int main(void)
+{
+	int number_failed = 0;
+	SRunner *sr;
+
+	sr = srunner_create(ttail_search_suite());
+	srunner_set_fork_status(sr, CK_FORK);
+
+	srunner_run_all(sr,CK_VERBOSE);
+	number_failed = srunner_ntests_failed(sr);
+	srunner_free(sr);
+	return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+
+}