Bugfix + tests for ttail_search_files functions

src/include/ttail_search_files.h

@@ -122,6 +122,7 @@ inline long _ttail_file_next_line(FILE*);
  *Set f pos to line begining and return the position
  *@param FILE* f 
  *@return -1 on error else return the next line position
+ *@todo recheck
  */
 inline long _ttail_file_start_line(FILE*);
 

src/ttail_search_files.c

@@ -60,8 +60,12 @@ File sorting not implemented yet\n");
 	}
 	/* TODO begining binary search of date_min */
 	ret = _ttail_search_files_binary_search(t, tm, (const struct tm**)ftm);
-
-	return 0;
+	for(i=0; i<t->logfile_sz; i++)
+	{
+		if(ftm) { free(ftm[i]); }
+	}
+	free(ftm);
+	return ret;
 	goto _ttail_search_closest_files_err;
 
 	_ttail_search_closest_files_err:
@@ -111,7 +115,7 @@ int _ttail_search_files_binary_search(ttail_t* t, const struct tm* in,
 			/* found at the begining of the file */
 			return 0;
 		}
-		else if (!cmax)
+		else if (cmax <= 0)
 		{
 			/* found at EOF */
 			*off = _ttail_from_search_from_end(t, *id, in);
@@ -490,8 +494,10 @@ inline off_t _ttail_from_search_from_end(ttail_t* t , size_t id ,
 	FILE *f;
 	struct tm curtm;
 	off_t last;
-	int ret;
+	int ret, cmpret;
+	off_t result;
 
+	result = -1;
 	f = t->logfile[id];
 	if(fseek(f, -1, SEEK_END) < 0)
 	{
@@ -502,36 +508,41 @@ inline off_t _ttail_from_search_from_end(ttail_t* t , size_t id ,
 		last = _ttail_file_start_line(f);
 		if(last < 0)
 		{
-			goto _ttail_from_search_from_end_err;
+			break;
 		}
 		if(ttail_getline(t, id) < 0)
 		{
-			goto _ttail_from_search_from_end_err;
+			break;
 		}
 		ret = ttail_logline2date(t, ttail_getline_buf(t), &curtm);
 		if(ret < 0)
 		{
-			goto _ttail_from_search_from_end_err;
+			break;
 		}
-		if(!ret && !ttail_tm_cmp(&curtm, tm))
+		cmpret = ttail_tm_cmp(&curtm, tm);
+		if(!ret)
 		{
-			/* found */
-			break;
+			if(cmpret >= 0)
+			{
+				/* found but continue to search the first one*/
+				result = last;
+			}
+			else
+			{
+				break;
+			}
 		}
 		if(last == 0)
 		{
 			/* considere the begining of the file as the answer */
 			return 0;
 		}
-		if(fseek(f, last-1, SEEK_CUR))
+		if(fseek(f, last-1, SEEK_SET))
 		{
-			goto _ttail_from_search_from_end_err;
+			return -1;
 		}
 	}
-	return last;
-	
-	_ttail_from_search_from_end_err:
-	return -1;
+	return result;
 }
 
 inline int _ttail_file_off_cmp(ttail_t* t, size_t id, off_t off,

tests/ttail_search_check.c

@@ -320,9 +320,39 @@ START_TEST (test_search_files1)
 	ttail->prefix_sz = 0;
 	ttail_set_fmt(ttail, "%B%n%d %H:%M");
 
+	ret = _ttail_search_closest_files(ttail, &tm);
+	ck_assert_int_eq(ret, 1);
+	ck_assert(ttail->session->file.id == 0);
+	ck_assert(ttail->session->file.off == 0);
+}
+END_TEST
+
+START_TEST (test_search_files2)
+{
+	int ret;
+	size_t i;
+	struct tm tm;
+	memset(&tm, 0, sizeof(tm));
+	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");
+
+	tm.tm_year = -1;
+	tm.tm_mon = 2;
+	tm.tm_mday = 6;
+	tm.tm_hour = 0;
+	tm.tm_min = 29;
+	tm.tm_sec = -1;
+	
 	ret = _ttail_search_closest_files(ttail, &tm);
 	ck_assert_int_eq(ret, 0);
 	ck_assert(ttail->session->file.id == 0);
+	ck_assert_int_eq(ttail->session->file.off, 221);
 }
 END_TEST
 
@@ -376,6 +406,7 @@ ttail_logline_closest_files_init() checks");
 	tcase_add_checked_fixture(tc_search_files,
 		setup_closest_fileinit, teardown_closest_fileinit);
 	tcase_add_test(tc_search_files, test_search_files1);
+	tcase_add_test(tc_search_files, test_search_files2);
 	
 
 	suite_add_tcase(s, tc_search_closest_fileinit);