Add some usefull functions & macro in ttail_check.h for std tests.

src/include/ttail_search_std.h

@@ -22,6 +22,7 @@
 #include <errno.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdio.h>
 
 typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
 /*<! Private search session for stdin */
@@ -45,14 +46,13 @@ struct _ttail_search_stdin_s
  *@return @ref getline()
  */
 #define ttail_std_getline(TTAIL) (getline(\
-	&(TTAIL->session->std.buff), &(TTAIL->session->std.buff_sz), stdin))
+	&(TTAIL->session->std.buff), &(TTAIL->session->std.buff_sz), TTAIL_STDIN))
 /*<!Accessor to getline wrapper buffer */
 #define ttail_std_getline_buff(TTAIL) (TTAIL->session->std.buff)
 
 /**@brief init private session members
  *@patam ttail_t* t
  *@return -1 on error else 0
- *@todo checks
  */
 int ttail_search_std_init(ttail_t* t);
 
@@ -88,5 +88,11 @@ void _ttail_search_print_stdin(ttail_t*, int);
  */
 void _ttail_search_stdin_free(ttail_t* t);
 
+/**@brief Set the stdin file descriptor
+ *
+ *Usefull for checks
+ */
+void _ttail_set_stdin(int);
+
 #endif
 

src/ttail_search_std.c

@@ -18,8 +18,25 @@
  */
 #include "ttail_search_std.h"
 
+int TTAIL_STDIN_FD = 0;
+FILE *TTAIL_STDIN = NULL;
+
 int ttail_search_std_init(ttail_t* t)
 {
+	if(!TTAIL_STDIN_FD)
+	{
+		TTAIL_STDIN = stdin;
+	}
+	else
+	{
+		TTAIL_STDIN = fdopen(TTAIL_STDIN_FD, "r");
+		if(!TTAIL_STDIN)
+		{
+			perror("Fail to open stdin");
+			return -1;
+		}
+	}
+
 	t->session = (ttail_search_t*)malloc(sizeof(ttail_search_stdin_t));
 	if(!t->session)
 	{
@@ -151,7 +168,9 @@ int _ttail_search_closest_stdin(ttail_t* t)
 					fprintf(stderr, "\n");
 				}
 				ttail_strict_msg();
+				return -1;
 			}
+			rd_sz = ttail_std_getline(t);
 			continue;
 		}
 		ret = ttail_tm_cmp(&tm, &(t->date_min));
@@ -165,7 +184,7 @@ int _ttail_search_closest_stdin(ttail_t* t)
 	if(rd_sz < 0)
 	{
 		tmp = errno;
-		ret = feof(stdin);
+		ret = feof(TTAIL_STDIN);
 		if(ret <= 0)
 		{
 			errno = tmp;
@@ -226,7 +245,7 @@ void _ttail_search_print_stdin(ttail_t* t, int fd)
 	if(rd_sz < 0)
 	{
 		tmp = errno;
-		ret = feof(stdin);
+		ret = feof(TTAIL_STDIN);
 		if(ret <= 0)
 		{
 			errno = tmp;
@@ -238,9 +257,19 @@ void _ttail_search_print_stdin(ttail_t* t, int fd)
 
 void _ttail_search_stdin_free(ttail_t* t)
 {
+	if(TTAIL_STDIN)
+	{
+		fclose(TTAIL_STDIN);
+	}
 	if(t->session->std.buff)
 	{
 		free(t->session->std.buff);
 	}
 }
 
+void _ttail_set_stdin(int std)
+{
+	TTAIL_STDIN_FD = std;
+	TTAIL_STDIN = NULL;
+}
+

tests/ttail_check.h

@@ -6,6 +6,9 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <libgen.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
 
 #include "ttail.h"
 #include "ttail_init.h"
@@ -66,6 +69,30 @@ int main(int argc, char **argv) {\
 	ck_assert_msg(test, _err_msg);\
 }
 
+#define close_stdpipe() {\
+	close(STDPIPE);\
+	STDPIPE = -1;\
+}
+
+#define send_sample_stdpipe(id) {\
+	int ret;\
+	char buff[1024];\
+	while((ret= read(samples_fd[id], buff, 1024)) > 0)\
+	{\
+		ret = write(STDPIPE, buff, strlen(buff));\
+		if(ret < 0)\
+		{\
+			perror("Unable to write through pipe");\
+			ck_abort_msg("Unable to write through pipe");\
+		}\
+	}\
+	if(ret < 0)\
+	{\
+		perror("Unable to read through pipe");\
+		ck_abort_msg("Unable to read through pipe");\
+	}\
+}
+
 char *fname[__Fname_sz];
 /*date formats*/
 char *fmt[] = TTAIL_DEFAULT_FORMATS;
@@ -74,6 +101,10 @@ char *samples[6] = { "./samples/1.log", "./samples/2.log", "./samples/3.log",\
 	"./samples/4.log", "./samples/5.log", "./samples/1.1.log"};
 off_t samples_sz[6] = { 442, 0, 893, 2587, 2310, 220 };
 
+int samples_fd[6];
+
+int STDPIPE;
+
 void teardown_ttail(void)
 {
 	ttail_free(ttail);
@@ -143,6 +174,36 @@ void setup_closest(void)
 	ttail = ttail_init(1, (char**)&"foo");
 }
 
+void setup_closest_stdin(void)
+{
+	int ret, pipes[2], i;
+
+	ret = pipe(pipes);
+	if(ret < 0)
+	{
+		perror("fail to open pipe");
+		ck_abort_msg("fail to open pipe");
+	}
+	_ttail_set_stdin(pipes[0]);
+	STDPIPE = pipes[1];
+	
+	for(i=0; i<sizeof(samples_fd)/sizeof(int); i++)
+	{
+		samples_fd[i] = open(samples[i], 0, O_RDONLY);
+	}
+
+	setup_closest();
+}
+
+void teardown_closest_stdin(void)
+{
+	if(STDPIPE > 0)
+	{
+		close(STDPIPE);
+	}
+	teardown_closest();
+}
+
 void setup_closest_fileinit(void)
 {
 	size_t i;