Implemented ttail_init_check() + tests

src/include/ttail.h

@@ -49,6 +49,12 @@ typedef struct _ttail_s ttail_t;
  */
 ttail_t *ttail_init(int argc, char **argv);
 
+/**@brief Checks that init lead to a valid runtime
+ *@param ttail_t* t
+ *@return 0 if no error -1 if fatal error
+ */
+int ttail_init_check(ttail_t*);
+
 /**@brief Add a logfile
  *@param ttail_t*
  *@param const char * filename

src/main.c

@@ -2,5 +2,12 @@
 
 int main(int argc, char **argv)
 {
+	ttail_t *ttail;
+	ttail = ttail_init(argc, argv);
+	if(ttail_init_check(ttail) < 0)
+	{
+		ttail_free(ttail);
+		return 1;
+	}
 	return 0;
 }

src/ttail.c

@@ -128,6 +128,25 @@ for date format");
 	return NULL;
 }
 
+int ttail_init_check(ttail_t* t)
+{
+	if(t->flag & TTAIL_FLAG_DATE_MAX)
+	{
+		fprintf(stderr, "Warning : date-max not yet implemented\n");
+	}
+	if(!(t->flag & TTAIL_FLAG_DATE_MIN))
+	{
+		fprintf(stderr, "--date-min -d is mandatory\n");
+		return -1;
+	}
+	if(!(t->flag & TTAIL_FLAG_FORMAT))
+	{
+		fprintf(stderr, "No date format set nor detected. Abording.\n");
+		return -1;
+	}
+	return 0;
+}
+
 int ttail_add_logfile(ttail_t* res, const char* filename)
 {
 	void *tmp;
@@ -249,7 +268,7 @@ int ttail_set_dates(ttail_t* res, char* dates[2])
 			/* no format specified */
 			ret = ttail_format_guess(res, dates[c],
 				c==0?&(res->date_min):&(res->date_max));
-			if(res < 0)
+			if(ret < 0)
 			{
 				fprintf(stderr, "Unable to guess format for \
 date '%s'\n", dates[c]);

tests/ttail_init_check.c

@@ -434,11 +434,46 @@ START_TEST (test_init_setdates_nofmt_both)
 }
 END_TEST
 
+START_TEST (test_init_check_bad1)
+{
+	ck_assert_int_eq(ttail_init_check(ttail), -1);
+}
+END_TEST
+
+START_TEST (test_init_check_bad2)
+{
+	ttail->flag |= TTAIL_FLAG_DATE_MAX;
+	ck_assert_int_eq(ttail_init_check(ttail), -1);
+}
+END_TEST
+
+START_TEST (test_init_check1)
+{
+	char *arg[] = {"88/10/22", NULL};
+	struct tm zero;
+	char *arg0;
+
+	arg0 = malloc(sizeof(char)*(strlen(arg[0])+1));
+	if(!arg0)
+	{
+		perror("Malloc failed for argument");
+		ck_abort_msg("Unable to allocate memory");
+	}
+	strcpy(arg0, arg[0]);
+	arg[0]=arg0;
+
+	memset(&zero, 0, sizeof(struct tm));
+
+	ttail_set_dates(ttail, arg);
+	ck_assert_int_eq(ttail_init_check(ttail), 0);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
 	TCase *tc_init_logfile, *tc_init_prefix ,*tc_init_fmt_guess, \
-		*tc_init_set_dates;
+		*tc_init_set_dates, *tc_init_check;
 
 	s = suite_create("ttail init checks");
 
@@ -473,14 +508,23 @@ Suite * ttail_init_suite(void)
 	tc_init_set_dates = tcase_create("dates min/max init checks");
 	tcase_add_checked_fixture(tc_init_set_dates,
 		setup_ttail_empty, teardown_ttail);
-	tcase_add_test(tc_init_fmt_guess, test_init_setdates_nothing);
-	tcase_add_test(tc_init_fmt_guess, test_init_setdates_nofmt_min);
-	tcase_add_test(tc_init_fmt_guess, test_init_setdates_nofmt_max);
-	tcase_add_test(tc_init_fmt_guess, test_init_setdates_nofmt_both);
+	tcase_add_test(tc_init_set_dates, test_init_setdates_nothing);
+	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_min);
+	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_max);
+	tcase_add_test(tc_init_set_dates, test_init_setdates_nofmt_both);
+
+	tc_init_check = tcase_create("ttail_init_check() checks");
+	tcase_add_checked_fixture(tc_init_check,
+		setup_ttail_empty, teardown_ttail);
+	tcase_add_test(tc_init_fmt_guess, test_init_check_bad1);
+	tcase_add_test(tc_init_fmt_guess, test_init_check_bad2);
+	tcase_add_test(tc_init_fmt_guess, test_init_check1);
 
 	suite_add_tcase(s, tc_init_logfile);
 	suite_add_tcase(s, tc_init_prefix);
 	suite_add_tcase(s, tc_init_fmt_guess);
+	suite_add_tcase(s, tc_init_set_dates);
+	suite_add_tcase(s, tc_init_check);
 	return s;
 }