Updated the search_closest_files function

src/ttail_search_files.c

@@ -3,12 +3,82 @@
 int _ttail_search_closest_files(ttail_t* t)
 {
 	int ret;
+	size_t i, prev;
+	struct tm **ftm; /* t->logfile_sz len of struct tm[2] */
 	ret = _ttail_search_closest_files_init(t);
 	if(ret)
 	{
 		return ret;
 	}
-	/* Checking that files are sorted well */
+	/* Storing min & max of each files in ftm and checking that files are 
+	 * sorted well */
+	ftm = malloc(sizeof(struct tm*) * t->logfile_sz);
+	if(!ftm)
+	{
+		perror("Unable to allocate memory");
+		goto _ttail_search_closest_files_alloc_err;
+	}
+	for(i=0; i<t->logfile_sz; i++)
+	{
+		ftm[i] = malloc(sizeof(struct tm)*2);
+		if(!ftm[i])
+		{
+			perror("Unable to allocate memory for time");
+			goto _ttail_search_closest_files_alloc_loop_err;
+		}
+		if(!t->logfile[i])
+		{
+			continue;
+		}
+		ret = _ttail_file_minmax(t, 0, ftm[i]);
+		if(ret < 0)
+		{
+			fprintf(stderr, "Minmax error\n");
+			goto _ttail_search_closest_files_loop_err;
+		}
+		else if (ret == 1)
+		{
+			if(t->verbose)
+			{
+				fprintf(stderr, "Warning : unable to find \
+a valid date in '%s'\n", t->logfile_name[i]);
+			}
+			free(ftm[i]);
+			ftm[i] = NULL;
+			fclose(t->logfile[i]);
+			t->logfile[i] = NULL;
+		}
+		prev = i;
+		if(i && prev &&
+			ttail_tm_cmp(&(ftm[prev][1]), &(ftm[i][0])) > 0)
+		{
+			/* files are not sorted */
+			fprintf(stderr, "Files do not seems to be sorted. \
+File sorting not implemented yet\n");
+			goto _ttail_search_closest_files_loop_err;
+		}
+	}
+	/* TODO begining binary search of date_min */
+
+	return 0;
+	goto _ttail_search_closest_files_err;
+
+	_ttail_search_closest_files_err:
+	i = t->logfile_sz;
+	do
+	{
+		_ttail_search_closest_files_alloc_loop_err:
+		i--;
+		_ttail_search_closest_files_loop_err:
+		if(ftm[i])
+		{
+			free(ftm[i]);
+		}
+	}while(i);
+	free(ftm);
+	_ttail_search_closest_files_alloc_err:
+	return -1;
+}
 
 	return 0;
 }

tests/ttail_search_check.c

@@ -154,7 +154,6 @@ START_TEST (test_file_minmax1)
 	/**@todo complete the testcase */
 	int r;
 	struct tm tm[2];
-	printf("%ld\n", ttail->logfile_sz);
 	ttail->flag |= TTAIL_FLAG_PREFIX;
 	ttail->prefix_sz = 0;
 	ttail_set_fmt(ttail, "%b%n%d %H:%M");
@@ -302,12 +301,36 @@ START_TEST (test_search_log2date_faildate)
 }
 END_TEST
 
+/*
+ *	tests ttail_search_closest_files()
+ */
+
+START_TEST (test_search_files1)
+{
+	int ret;
+	size_t i;
+	for(i=1;i<ttail->logfile_sz;i++)
+	{
+		fclose(ttail->logfile[i]);
+		ttail->logfile[i] = NULL;
+	}
+	ttail->flag |= TTAIL_FLAG_PREFIX;
+	ttail->prefix_sz = 0;
+	ttail_set_fmt(ttail, "%B%n%d %H:%M");
+
+	ret = _ttail_search_closest_files(ttail);
+	ck_assert_int_eq(ret, 0);
+	ck_assert(ttail->session->file.id == 0);
+}
+END_TEST
+
 Suite * ttail_search_files_suite(void)
 {
 	Suite *s;
 	TCase *tc_search_closest_fileinit, *tc_file_line,
 		*tc_file_minmax;
 	TCase *tc_search_subst, *tc_search_logline2date;
+	TCase *tc_search_files;
 
 	s = suite_create("ttail search_files checks");
 	tc_search_closest_fileinit = tcase_create("\
@@ -347,11 +370,18 @@ ttail_logline_closest_files_init() checks");
 	tcase_add_test(tc_search_subst, test_search_log2date_failpref);
 	tcase_add_test(tc_search_subst, test_search_log2date_faildate);
 
+	tc_search_files = tcase_create("ttail_logline2date() checks");
+	tcase_add_checked_fixture(tc_search_files,
+		setup_closest_fileinit, teardown_closest_fileinit);
+	tcase_add_test(tc_search_files, test_search_files1);
+	
+
 	suite_add_tcase(s, tc_search_closest_fileinit);
 	suite_add_tcase(s, tc_file_line);
 	suite_add_tcase(s, tc_file_minmax);
 	suite_add_tcase(s, tc_search_subst);
 	suite_add_tcase(s, tc_search_logline2date);
+	suite_add_tcase(s, tc_search_files);
 	return s;
 }