Fix #13 Sort files given as argument

Now ttail is able to sort logfiles given as arguement.
The sort function _ttail_file_sort place files with no valid date to the
end of the file list and is able to detect if some files overlaps.

No tests written...

docs/man/man1/ttail.1

@@ -1,4 +1,4 @@
-.TH "ttail" 1 "Mon May 15 2017" "Version 0.0.2" "ttail" \" -*- nroff -*-
+.TH "ttail" 1 "Sun May 21 2017" "Version 0.0.2" "ttail" \" -*- nroff -*-
 .ad l
 .nh
 .SH NAME
@@ -167,9 +167,6 @@ The O modifier specifies that the numerical input may be in an alternative local
 %OW The week number of the year (Monday as the first day of the week) using the locale's alternative numeric symbols\&.
 .PP
 %Oy The year (offset from C) using the locale's alternative numeric symbols\&.
-.SH "Known limitations"
-.PP
-Files given as argument has to be sorted\&.
 .SH "AUTHOR"
 .PP
 Written by Yann Weber <yann.weber@members.fsf.org>

src/include/doxygen.h

@@ -161,9 +161,6 @@
  * 
  * \%Oy    The year (offset from %C) using the locale's alternative numeric symbols.
  *
- *@section known_limitations Known limitations
- *Files given as argument has to be sorted.
- *
  *@section AUTHOR
  *Written by Yann Weber <yann.weber@members.fsf.org>
  *

src/include/ttail_search_files.h

@@ -87,6 +87,33 @@ struct _ttail_search_file_s
 /*<!Accessor to getline wrapper buffer */
 #define ttail_file_getline_buf(TTAIL) (TTAIL->session->file.buf)
 
+/**@brief Move an element to end
+ *@param void* v : array
+ *@param size_t i : elt to move
+ *@param size_t count : v elements count - 1
+ *@param type t : v type
+ */
+#define TTAIL_MVF(v, i, count, t) {\
+	t tmp;\
+	tmp = v[i];\
+	memmove(v+i, v+i+1, (count - i) * sizeof(t));\
+	v[count] = tmp;\
+}
+
+/**@brief Move back an element to j position
+ *@warning j < i
+ *@param void* v
+ *@param size_t i : src index
+ *@param size_t j : dst index
+ *@param type t : v type
+ */
+#define TTAIL_MVBF(v, i, j, t) {\
+	t tmp;\
+	tmp = v[i];\
+	memmove(v+j+1, v+j, (i - j)*sizeof(t));\
+	v[j] = tmp;\
+}
+
 /**@brief Init the ttail->session
  *@note Needed for format autodetection
  *@return 0 on success -1 on failure
@@ -157,6 +184,14 @@ int _ttail_file_reopen(ttail_t*, size_t);
  */
 inline int _ttail_file_minmax(ttail_t*, size_t, struct tm[2]);
 
+/**@brief Sort logfiles list
+ *@param ttail_t* ttail
+ *@param struct tm** ftm : files min and max date
+ *@return 0 on success -1 if error
+ *@todo write tests
+ */
+inline int _ttail_file_sort(ttail_t*, struct tm**);
+
 /**@brief Search next line
  *
  *Set f pos to next line begining and return the position

src/ttail_search_files.c

@@ -21,9 +21,9 @@
 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] */
-	char prev_found;
+	size_t i;
+	struct tm **ftm; /* an array with t->logfile_sz struct tm[2] */
+
 	/* Storing min & max of each files in ftm and checking that files are 
 	 * sorted well */
 	ftm = malloc(sizeof(struct tm*) * t->logfile_sz);
@@ -33,8 +33,6 @@ int _ttail_search_closest_files(ttail_t* t)
 		goto _ttail_search_closest_files_alloc_err;
 	}
 	ret = 0; /* to avoid may be used uninitialized error */
-	prev_found = 0;
-	prev = 0;
 	for(i=0; i<t->logfile_sz; i++)
 	{
 		if(!t->logfile[i])
@@ -66,18 +64,11 @@ in '%s'\n", t->logfile_name[i]);
 				ttail_strict_msg();
 				goto _ttail_search_closest_files_loop_err;
 			}
-			continue;
 		}
-		if(i && prev_found &&
-			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;
-		}
-		prev_found = 1;
-		prev = i;
+	}
+	if(_ttail_file_sort(t, ftm) < 0)
+	{
+		goto _ttail_search_closest_files_err;
 	}
 	if(t->flag & TTAIL_FLAG_DATE_MIN)
 	{
@@ -744,6 +735,78 @@ int _ttail_file_reopen(ttail_t* t, size_t id)
 	return t->logfile[id]?0:-1;
 }
 
+inline int _ttail_file_sort(ttail_t* t, struct tm** ftm)
+{
+	size_t i, j, count;
+	short sorted, warn;
+
+	count = t->logfile_sz;
+	i=0;
+	warn = 0;
+	for(i=0;i<count;i++)
+	{
+		while(!ftm[i] && i<count)
+		{
+			//move invalid dates to the end
+			count--;
+			TTAIL_MVF(t->logfile_name, i, count, char*);
+			TTAIL_MVF(t->logfile, i, count, FILE*);
+			TTAIL_MVF(t->session->file.file_sz, i, count,
+				off_t);
+			TTAIL_MVF(t->session->file.vfile, i, count,
+				off_t);
+			TTAIL_MVF(ftm, i, count, struct tm*);
+		}
+		if(!i ||i == count|| ttail_tm_cmp(&(ftm[i-1][1]), &(ftm[i][0])) < 0)
+		{
+			continue;
+		}
+		sorted=0;
+		for(j=0; j<i;j++)
+		{
+			if(ttail_tm_cmp(&(ftm[i][1]), &(ftm[j][0])) < 0
+			   || (j > 0 && ttail_tm_cmp(&(ftm[i][0]), &(ftm[j-1][1])) > 0))
+			{
+				TTAIL_MVBF(t->logfile_name, i, j, char*);
+				TTAIL_MVBF(t->logfile, i, j, FILE*);
+				TTAIL_MVBF(t->session->file.file_sz, i, j,
+					off_t);
+				TTAIL_MVBF(t->session->file.vfile, i, j,
+					off_t);
+				TTAIL_MVBF(ftm, i, j, struct tm*);
+				sorted=1;
+				if(!warn && t->verbose > 1)
+				{
+					fprintf(stderr, "Warning : Files list \
+given as argument has to be sorted.\n");
+				}
+				break;
+			}
+			if((ttail_tm_cmp(&(ftm[i][0]), &(ftm[j][0])) < 0
+			   && ttail_tm_cmp(&(ftm[i][1]), &(ftm[j][0])) > 0) ||
+			   (j > 0 &&(
+			   ttail_tm_cmp(&(ftm[i][1]), &(ftm[j][1])) > 0 &&
+			   ttail_tm_cmp(&(ftm[i][0]), &ftm[j][1]) < 0)))
+			{
+				fprintf(stderr, "Files list not sortable : \
+file %s and %s overlaps.\n", t->logfile_name[i], t->logfile_name[j]);
+				fprintf(stderr,"\
+meaning file1 date min < file2 date min < file1 date max \n\
+or file1 date min < file2 date max < file1 date max\n");
+				return -1;
+			}
+		}
+		if(sorted) { continue; }
+
+		fprintf(stderr,"Files list not sortable : file %s contains \
+or is inside another file\n", t->logfile_name[i]);
+		fprintf(stderr,"meaning that filex1 date min < file2 date min \
+and file1 date max > file2 date max\n");
+		return -1;
+	}
+	return 0;
+}
+
 inline long _ttail_file_next_line(ttail_t *t, size_t id)
 {
 	FILE *f;

tests/ttail_search_files.c

@@ -101,7 +101,7 @@ START_TEST (test_search_files3)
 
 	ret = _ttail_search_closest_files(ttail);
 	ck_assert_int_eq(ret, 0);
-	ck_assert_int_eq(ttail->session->file.off_min.id, 5);
+	ck_assert_int_eq(ttail->session->file.off_min.id, 1);
 	ck_assert_int_eq(ttail->session->file.off_min.off, 0);
 }
 END_TEST