Implements ttail_set_date() + tests

src/include/ttail.h

@@ -63,6 +63,15 @@ int ttail_add_logfile(ttail_t*, const char*);
  */
 int ttail_set_prefix(ttail_t*, const char*);
 
+/**@brief Set dates min/max
+ *
+ *After the call dates are free and set to NULL except if error
+ *@param ttail_t ttail instance
+ *@param char*[2] dates {min,max} both can be NULL
+ *@return -1 if error 0 else
+ */
+int ttail_set_dates(ttail_t*, char*[2]);
+
 /**@brief Attempt to guess a dateformat
  *@param ttail_t* ttail if manage to guess set the ttail_t.fmt
  *@param const char* date as a dtring
@@ -71,6 +80,7 @@ int ttail_set_prefix(ttail_t*, const char*);
  */
 int ttail_format_guess(ttail_t*, const char*, struct tm*);
 
+
 void ttail_free(ttail_t*);
 
 

src/ttail.c

@@ -113,40 +113,9 @@ for date format");
 		goto ttail_init_err;
 	}
 
-	/* date min/max processing */
-	for(c=0;c<c;c++)
+	if(ttail_set_dates(res, dates) < 0)
 	{
-		if(!dates[c])
-		{
-			continue;
-		}
-		if(!(res->flag & TTAIL_FLAG_PREFIX))
-		{
-			/* no format specified */
-			ret = ttail_format_guess(res, dates[c],
-				c==0?&(res->date_min):&(res->date_max));
-			if(res < 0)
-			{
-				fprintf(stderr, "Unable to guess format for \
-date '%s'\n", dates[c]);
-				goto ttail_init_err;
-			}
-			continue;
-		}
-		date = strptime(dates[c], res->fmt, 
-			c==0?&(res->date_min):&(res->date_max));
-		if(!date)
-		{
-			fprintf(stderr, "Unable to parse date-%s '%s' with \
-format '%s'\n", c==0?"min":"max", dates[c], res->fmt);
-			goto ttail_init_err;
-		}
-		else if(*date != '\0')
-		{
-			fprintf(stderr, "Leading caracters for date-%s : %s\n",\
-				c==0?"min":"max", date);
-		}
-		free(dates[c]);
+		goto ttail_init_err;
 	}
 
 	return res;
@@ -262,6 +231,55 @@ error message");
 	return -1;
 }
 
+int ttail_set_dates(ttail_t* res, char* dates[2])
+{
+	int c, ret;
+	char *date;
+
+	for(c=0;c<2;c++)
+	{
+		memset(c==0?&(res->date_min):&(res->date_max), 0, \
+			sizeof(struct tm));
+		if(!dates[c])
+		{
+			continue;
+		}
+		if(!(res->flag & TTAIL_FLAG_FORMAT))
+		{
+			/* no format specified */
+			ret = ttail_format_guess(res, dates[c],
+				c==0?&(res->date_min):&(res->date_max));
+			if(res < 0)
+			{
+				fprintf(stderr, "Unable to guess format for \
+date '%s'\n", dates[c]);
+				return -1;
+			}
+			res->flag |= c?TTAIL_FLAG_DATE_MAX:TTAIL_FLAG_DATE_MIN;
+			continue;
+		}
+		date = strptime(dates[c], res->fmt, 
+			c==0?&(res->date_min):&(res->date_max));
+		if(!date)
+		{
+			fprintf(stderr, "Unable to parse date-%s '%s' with \
+format '%s'\n", c==0?"min":"max", dates[c], res->fmt);
+			return -1;
+		}
+		else if(*date != '\0')
+		{
+			fprintf(stderr, "Leading caracters for date-%s : %s\n",\
+				c==0?"min":"max", date);
+		}
+		res->flag |= c?TTAIL_FLAG_DATE_MAX:TTAIL_FLAG_DATE_MIN;
+	}
+
+	if(dates[0]) { free(dates[0]); dates[0] = NULL; }
+	if(dates[1]) { free(dates[1]); dates[1] = NULL; }
+
+	return 0;
+}
+
 int ttail_format_guess(ttail_t* t, const char* date_str, struct tm* tm)
 {
 	int i, res;

tests/ttail_init_check.c

@@ -288,7 +288,6 @@ END_TEST
 START_TEST (test_init_guess_fmt_set)
 {
 	int ret;
-	struct tm tm;
 	char res[] = "%Y/%m/%d";
 	ret = ttail_format_guess(ttail, "1988/10/22", NULL);
 	ck_assert_int_eq(ret, 11);
@@ -299,12 +298,147 @@ START_TEST (test_init_guess_fmt_set)
 }
 END_TEST
 
+/*
+ * ttail_set_dates() tests
+ */
+
+START_TEST (test_init_setdates_nothing)
+{
+	int ret;
+	char *arg[] = {NULL, NULL};
+	struct tm zero;
+
+	memset(&zero, 0, sizeof(struct tm));
+
+	ret = ttail_set_dates(ttail, arg);
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MIN) == 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MAX) == 0);
+	ck_assert(memcmp(&zero, &(ttail->date_min), sizeof(struct tm)) == 0);
+	ck_assert(memcmp(&zero, &(ttail->date_max), sizeof(struct tm)) == 0);
+}
+END_TEST
+
+START_TEST (test_init_setdates_nofmt_min)
+{
+	int ret;
+	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));
+
+	ret = ttail_set_dates(ttail, arg);
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MIN) == TTAIL_FLAG_DATE_MIN);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MAX) == 0);
+	ck_assert(memcmp(&zero, &(ttail->date_max), sizeof(struct tm)) == 0);
+
+	ck_assert_int_eq(ttail->date_min.tm_year, 88);
+	ck_assert_int_eq(ttail->date_min.tm_mon, 9);
+	ck_assert_int_eq(ttail->date_min.tm_mday, 22);
+	ck_assert_int_eq(ttail->date_min.tm_hour, 0);
+	ck_assert_int_eq(ttail->date_min.tm_min, 0);
+	ck_assert_int_eq(ttail->date_min.tm_sec, 0);
+}
+END_TEST
+
+START_TEST (test_init_setdates_nofmt_max)
+{
+	int ret;
+	char *arg[] = {NULL, "88/10/22"};
+	struct tm zero;
+	char *arg1;
+
+	arg1 = malloc(sizeof(char)*(strlen(arg[1])+1));
+	if(!arg1)
+	{
+		perror("Malloc failed for argument");
+		ck_abort_msg("Unable to allocate memory");
+	}
+	strcpy(arg1, arg[1]);
+	arg[1]=arg1;
+
+	memset(&zero, 0, sizeof(struct tm));
+
+	ret = ttail_set_dates(ttail, arg);
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MIN) == 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MAX) == TTAIL_FLAG_DATE_MAX);
+	ck_assert(memcmp(&zero, &(ttail->date_min), sizeof(struct tm)) == 0);
+
+	ck_assert_int_eq(ttail->date_max.tm_year, 88);
+	ck_assert_int_eq(ttail->date_max.tm_mon, 9);
+	ck_assert_int_eq(ttail->date_max.tm_mday, 22);
+	ck_assert_int_eq(ttail->date_max.tm_hour, 0);
+	ck_assert_int_eq(ttail->date_max.tm_min, 0);
+	ck_assert_int_eq(ttail->date_max.tm_sec, 0);
+}
+END_TEST
+
+START_TEST (test_init_setdates_nofmt_both)
+{
+	int ret;
+	char *arg[] = {"1988/10/22", "2088/10/22"};
+	struct tm zero;
+	char *arg0, *arg1;
+
+	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;
+
+	arg1 = malloc(sizeof(char)*(strlen(arg[1])+1));
+	if(!arg1)
+	{
+		perror("Malloc failed for argument");
+		ck_abort_msg("Unable to allocate memory");
+	}
+	strcpy(arg1, arg[1]);
+	arg[1]=arg1;
+
+
+	memset(&zero, 0, sizeof(struct tm));
+
+	ret = ttail_set_dates(ttail, arg);
+	ck_assert_int_eq(ret, 0);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MIN) == TTAIL_FLAG_DATE_MIN);
+	ck_assert((ttail->flag & TTAIL_FLAG_DATE_MAX) == TTAIL_FLAG_DATE_MAX);
+
+	ck_assert_int_eq(ttail->date_min.tm_year, 88);
+	ck_assert_int_eq(ttail->date_min.tm_mon, 9);
+	ck_assert_int_eq(ttail->date_min.tm_mday, 22);
+	ck_assert_int_eq(ttail->date_min.tm_hour, 0);
+	ck_assert_int_eq(ttail->date_min.tm_min, 0);
+	ck_assert_int_eq(ttail->date_min.tm_sec, 0);
+
+	ck_assert_int_eq(ttail->date_max.tm_year, 188);
+	ck_assert_int_eq(ttail->date_max.tm_mon, 9);
+	ck_assert_int_eq(ttail->date_max.tm_mday, 22);
+	ck_assert_int_eq(ttail->date_max.tm_hour, 0);
+	ck_assert_int_eq(ttail->date_max.tm_min, 0);
+	ck_assert_int_eq(ttail->date_max.tm_sec, 0);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
-	TCase *tc_init_logfile;
-	TCase *tc_init_prefix;
-	TCase *tc_init_fmt_guess;
+	TCase *tc_init_logfile, *tc_init_prefix ,*tc_init_fmt_guess, \
+		*tc_init_set_dates;
 
 	s = suite_create("ttail init checks");
 
@@ -336,6 +470,14 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_init_fmt_guess, test_init_guess_noguess_notm);
 	tcase_add_test(tc_init_fmt_guess, test_init_guess_fmt_set);
 
+	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);
+
 	suite_add_tcase(s, tc_init_logfile);
 	suite_add_tcase(s, tc_init_prefix);
 	suite_add_tcase(s, tc_init_fmt_guess);