Implemented 2 utility functions + tests

src/include/ttail_search_files.h

@@ -41,6 +41,14 @@ int _ttail_search_closest_files(ttail_t*);
 int _ttail_search_closest_files_init(ttail_t*);
 int _ttail_search_closest_files_set_fsizes(ttail_t*);
 
+/**@brief Test if files are sorted
+ *
+ *If not sorted attempt to sort them
+ *@param ttail_t*
+ *@return -1 not sorted 0 sorted
+ */
+int _ttail_search_file_sorted(ttail_t*);
+
 /**@brief Attempt to reopen a file
  *@param ttail_t* ttail
  *@param size_t id file id in ttail
@@ -49,6 +57,22 @@ int _ttail_search_closest_files_set_fsizes(ttail_t*);
  */
 int _ttail_file_reopen(ttail_t*, size_t);
 
+/**@brief Search next line
+ *
+ *Set f pos to next line begining and return the position
+ *@param FILE* f 
+ *@return -1 on error 0 on EOF else return the next line position
+ */
+long _ttail_file_next_line(FILE*);
+
+/**@brief Search line start
+ *
+ *Set f pos to line begining and return the position
+ *@param FILE* f 
+ *@return -1 on error else return the next line position
+ */
+long _ttail_file_start_line(FILE*, const off_t);
+
 /**@brief Free the ttail_search_file_t session
  *@param ttail_t* ttail
  */

src/ttail_search_files.c

@@ -8,6 +8,7 @@ int _ttail_search_closest_files(ttail_t* t)
 	{
 		return ret;
 	}
+	/* Checking that files are sorted well */
 
 	return 0;
 }
@@ -102,6 +103,11 @@ int _ttail_search_closest_files_set_fsizes(ttail_t* t)
 	return 0;
 }
 
+int _ttail_search_file_sorted(ttail_t* t)
+{
+	return -1;
+}
+
 int _ttail_file_reopen(ttail_t* t, size_t id)
 {
 	if(t->logfile[id])
@@ -117,6 +123,112 @@ int _ttail_file_reopen(ttail_t* t, size_t id)
 	return t->logfile[id]?0:-1;
 }
 
+long _ttail_file_next_line(FILE* f)
+{
+	ssize_t s;
+	size_t r;
+	char *buff;
+	long res;
+	int c;
+	
+	r=0;
+	buff = NULL;
+	s = getline(&buff, &r, f);
+	if(s == -1)
+	{
+		goto _ttail_file_next_line_err;
+	}
+	while(1)
+	{
+		c = getc(f);
+		if(c == EOF)
+		{
+			return 0;
+		}
+		else if(c!='\n')
+		{
+			if(fseek(f, -1, SEEK_CUR)<0)
+			{
+				goto _ttail_file_next_line_err;
+			}
+			break;
+		}
+	}
+
+	res = ftell(f);
+	free(buff);
+	return res;
+
+	_ttail_file_next_line_err:
+	free(buff);
+	return -1;
+}
+
+long _ttail_file_start_line(FILE* f, const off_t sz)
+{
+	#define _STARTLN_BUFFLEN 32
+	long res; /* function result */
+	long read_beg, cur, last, start;
+	char buff[_STARTLN_BUFFLEN];
+	char *tmp;
+	int read_sz, read_len;
+	int c;
+
+	if((start = ftell(f)) < 0)
+	{
+		return -1;
+	}
+	res = 0;
+	read_beg = start;
+	while(!res && start)
+	{
+		if(fseek(f, read_beg, SEEK_SET) < 0)
+		{
+			return -1;
+		}
+		start = read_beg;
+		read_sz = start <= _STARTLN_BUFFLEN?start:_STARTLN_BUFFLEN;
+		read_beg = start - read_sz;
+		if(fseek(f, read_beg, SEEK_SET) < 0)
+		{
+			return -1;
+		}
+		last = -1; /* last pos we saw a '\n' */
+		cur = read_beg;
+		while(cur < start)
+		{
+			c = getc(f);
+			if(c == EOF)
+			{
+				if(!res)
+				{
+					return 0;
+				}
+				break;
+			}
+			else if (c =='\n')
+			{
+				last = cur;
+			}
+			else if(last >= 0)
+			{
+				res = cur;
+				last = -1;
+			}
+			cur++;
+		}
+		if(!read_beg)
+		{
+			break;
+		}
+	}
+	if(fseek(f, res, SEEK_SET) < 0)
+	{
+		return -1;
+	}
+	return res;
+}
+
 void _ttail_search_file_free(ttail_t* t)
 {
 	if(!t->session)

tests/ttail_search_check.c

@@ -1,4 +1,5 @@
 #include <check.h>
+#include <stdio.h>
 #include <libgen.h>
 
 #include "ttail.h"
@@ -10,6 +11,22 @@ ttail_t *ttail;
 char *samples[5] = { "./samples/1.log", "./samples/2.log", "./samples/3.log",\
 	"./samples/4.log", "./samples/5.log"};
 off_t samples_sz[5] = { 442, 0, 893, 2587, 2310 };
+FILE *fpl;
+
+void setup_file_line(void)
+{
+	fpl = fopen(samples[0], "r");
+	if(!fpl)
+	{
+		perror("Unable to open file for testing :");
+		ck_abort();
+	}
+}
+
+void teardown_file_line(void)
+{
+	fclose(fpl);
+}
 
 void teardown_closest(void)
 {
@@ -80,10 +97,55 @@ START_TEST (test_search_closest_init_vfile)
 }
 END_TEST
 
+/*
+ * _ttail_file_next_line() & _ttail_file_line_start() tests
+ */
+START_TEST (test_file_line_next)
+{
+	long res;
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 77);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 136);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 221);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 298);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 357);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == 0);
+	res = _ttail_file_next_line(fpl);
+	ck_assert(res == -1);
+}
+END_TEST
+
+START_TEST (test_file_line_start)
+{
+	long res;
+	fseek(fpl, -1, SEEK_END);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	printf("%ld\n", res);
+	ck_assert(res == 357);
+	fseek(fpl, -1, SEEK_CUR);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	printf("%ld\n", res);
+	ck_assert(res == 298);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	ck_assert(res == 221);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	ck_assert(res == 136);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	ck_assert(res == 77);
+	res = _ttail_file_start_line(fpl, samples_sz[0]);
+	ck_assert(res == 0);
+}
+END_TEST
+
 Suite * ttail_search_suite(void)
 {
 	Suite *s;
-	TCase *tc_search_closest_fileinit;
+	TCase *tc_search_closest_fileinit, *tc_file_line;
 
 	s = suite_create("ttail search checks");
 	tc_search_closest_fileinit = tcase_create("\
@@ -96,7 +158,14 @@ ttail_logline_closest_files_init() checks");
 	tcase_add_test(tc_search_closest_fileinit,
 		test_search_closest_init_vfile);
 
+	tc_file_line = tcase_create("ttail_file_*line*() checks");
+	tcase_add_checked_fixture(tc_file_line,
+		setup_file_line, teardown_file_line);
+	tcase_add_test(tc_file_line, test_file_line_next);
+	tcase_add_test(tc_file_line, test_file_line_start);
+
 	suite_add_tcase(s, tc_search_closest_fileinit);
+	suite_add_tcase(s, tc_file_line);
 	return s;
 }