Fix #2 Implements stdin operations

Seems to work with stdin

src/Makefile.am

@@ -1,9 +1,8 @@
 bin_PROGRAMS = ttail
 noinst_LIBRARIES= libttail.a
 
-libttail_a_SOURCES = ttail_init.c ttail_search.c ttail_search_files.c
+libttail_a_SOURCES = 	ttail_init.c ttail_search.c ttail_search_files.c ttail_search_std.c
 ttail_SOURCES = main.c $(libttail_a_SOURCES)
-#ttail_SOURCES = main.c ttail_init.c ttail_search.c ttail_search_files.c
 if HUGEFILE
 ttail_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE
 libttail_a_CFLAGS = @CFLAGS@ -DTTAIL_HUGE_FILE

src/include/ttail_search.h

@@ -10,7 +10,6 @@
 #include <unistd.h>
 
 typedef union _ttail_search_u ttail_search_t;
-typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
 #include "ttail.h"
 typedef char* (*ttail_search_subst_f)(ttail_t*, const char*);
 /**@brief Comparison results
@@ -22,27 +21,9 @@ typedef char* (*ttail_search_subst_f)(ttail_t*, const char*);
  */
 typedef int ttail_cmp_res;
 
-/**@brief Convenient wrapper for getline
- *@param ttail_t* TTAIL
- *@param size_t ID file id
- *@return @ref getline()
- */
-#define ttail_getline(TTAIL, ID, SESS) (getline(\
-	&(TTAIL->session->SESS.buf), &(TTAIL->session->SESS.buf_sz),\
-	TTAIL->logfile[ID]))
-/*<!Accessor to getline wrapper buffer */
-#define ttail_std_getline_buf(TTAIL) (TTAIL->session->std.buf)
-#define ttail_std_getline(TTAIL, ID) ttail_getline(TTAIL, ID, std)
-
 #include "config.h"
 #include "ttail_search_files.h"
-
-/*<! Private search session for stdin */
-struct _ttail_search_stdin_s
-{
-	char *buff;
-	size_t buff_sz;
-};
+#include "ttail_search_std.h"
 
 /**@brief Search session is an union depending in the search method
  * employed
@@ -65,20 +46,6 @@ int ttail_search_closest(ttail_t*);
  */
 void ttail_search_print_res(ttail_t*);
 
-/**@brief @ref ttail_search_closest() implementation for stdin
- *@param ttail_t*
- *@param struct tm* tmin
- *@return 0 if ok -1 if fatal error 1 if not found
- *@todo implement me
- */
-int _ttail_search_closest_stdin(ttail_t*);
-/**@brief Output result loglines to stdout
- *@param ttail_t*
- *@param int fd
- *@todo implement me
- */
-void _ttail_search_print_stdin(ttail_t*, int);
-
 /**@brief Loglines comparison function
  *@param ttail_t* ttail
  *@param const char* logline a
@@ -87,14 +54,6 @@ void _ttail_search_print_stdin(ttail_t*, int);
  */
 ttail_cmp_res ttail_cmp_loglines(ttail_t*, const char*, const char*);
 
-/**@brief compare a logline to a date
- *@param ttail_t* ttail
- *@param const char* logline
- *@param struct tm* @see time.h
- *@return @ref ttail_cmp_res
- */
-ttail_cmp_res ttail_cmp_logline(ttail_t*, const char*, struct tm*);
-
 /**@brief Fetch a date from a logline
  *@param ttail_t* ttail
  *@param const char* logline

src/include/ttail_search_files.h

@@ -62,7 +62,10 @@ struct _ttail_search_file_s
  *@param size_t ID file id
  *@return @ref getline()
  */
-#define ttail_file_getline(TTAIL, ID) (ttail_getline(TTAIL, ID, file))
+#define ttail_file_getline(TTAIL, ID) (getline(\
+	&(TTAIL->session->file.buf), &(TTAIL->session->file.buf_sz),\
+	TTAIL->logfile[ID]))
+
 /*<!Accessor to getline wrapper buffer */
 #define ttail_file_getline_buf(TTAIL) (TTAIL->session->file.buf)
 

src/include/ttail_search_std.h

@@ -0,0 +1,59 @@
+#ifndef _ttail_search_std_h__
+#define _ttail_search_std_h__
+
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+typedef struct _ttail_search_stdin_s ttail_search_stdin_t;
+/*<! Private search session for stdin */
+struct _ttail_search_stdin_s
+{
+	char *buff;
+	size_t buff_sz;
+};
+
+#include "config.h"
+#include "ttail.h"
+#include "ttail_search.h"
+
+/**@brief Convenient wrapper for getline
+ *@param ttail_t* TTAIL
+ *@param size_t ID file id
+ *@return @ref getline()
+ */
+#define ttail_std_getline(TTAIL) (getline(\
+	&(TTAIL->session->std.buff), &(TTAIL->session->std.buff_sz), 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_closest_std_init(ttail_t* t);
+
+/**@brief @ref ttail_search_closest() implementation for stdin
+ *@note when returns ttail->session->std.buff contains the first
+ *line to print
+ *@param ttail_t*
+ *@param struct tm* tmin
+ *@return 0 if ok -1 if fatal error 1 if not found
+ *@todo checks
+ */
+int _ttail_search_closest_stdin(ttail_t*);
+/**@brief Output result loglines to stdout
+ *@param ttail_t*
+ *@param int fd
+ *@todo checks
+ */
+void _ttail_search_print_stdin(ttail_t*, int);
+
+/**@brief free private session members
+ *@patam ttail_t* t
+ */
+void _ttail_search_stdin_free(ttail_t* t);
+
+#endif
+

src/ttail_search.c

@@ -32,19 +32,10 @@ void ttail_search_print_res(ttail_t* t)
 	else
 	{
 		_ttail_search_print_stdin(t, 1);
+		_ttail_search_stdin_free(t);
 	}
 }
 
-int _ttail_search_closest_stdin(ttail_t* t)
-{
-	return 0;
-}
-
-void _ttail_search_print_stdin(ttail_t* t, int fd)
-{
-	return;
-}
-
 int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
 {
 	const char *subst, *ret;

src/ttail_search_std.c

@@ -0,0 +1,129 @@
+#include "ttail_search_std.h"
+
+int _ttail_search_closest_std_init(ttail_t* t)
+{
+	t->session = (ttail_search_t*)malloc(sizeof(ttail_search_stdin_t));
+	if(!t->session)
+	{
+		perror("Unable to allocate memory for search session");
+		return -1;
+	}
+	t->session->std.buff = NULL;
+	t->session->std.buff_sz = 0;
+	return 0;
+}
+
+int _ttail_search_closest_stdin(ttail_t* t)
+{
+	struct tm tm;
+	ssize_t rd_sz;
+	int ret, tmp;
+	if(_ttail_search_closest_std_init(t) < 0)
+	{
+		return -1;
+	}
+	if(!(t->flag & TTAIL_FLAG_DATE_MIN))
+	{
+		return 0;
+	}
+	while((rd_sz = ttail_std_getline(t)) > 0)
+	{
+		ttail_tm_init(&tm);
+		ret = ttail_logline2date(t, ttail_std_getline_buff(t), &tm);
+		if(ret < 0)
+		{
+			return -1;
+		}
+		else if(ret > 0)
+		{
+			continue;
+		}
+		ret = ttail_tm_cmp(&tm, &(t->date_min));
+		if(ret >= 0)
+		{
+			//buffer contains the first line to print
+			return 0;
+		}
+	}
+	if(rd_sz < 0)
+	{
+		tmp = errno;
+		ret = feof(stdin);
+		if(ret <= 0)
+		{
+			errno = tmp;
+			perror("Error while reading loglines from stdin");
+			return -1;
+		}
+	}
+	return 0;
+}
+
+void _ttail_search_print_stdin(ttail_t* t, int fd)
+{
+	struct tm tm;
+	ssize_t rd_sz;
+	int ret, tmp;
+	
+	rd_sz = strlen(ttail_std_getline_buff(t));
+	if(!(t->flag & TTAIL_FLAG_DATE_MAX))
+	{
+		do
+		{
+			ret = write(1, ttail_std_getline_buff(t),
+				sizeof(char)*rd_sz);
+			if(ret < 0)
+			{
+				perror("Unable to write to stdout");
+				return;
+			}
+		}
+		while((rd_sz = ttail_std_getline(t)) > 0);
+	}
+	else
+	{
+		do
+		{
+			ttail_tm_init(&tm);
+			ret = ttail_logline2date(t, ttail_std_getline_buff(t),
+				&tm);
+			//dropping errors
+			if(ret == 0)
+			{
+				ret = ttail_tm_cmp(&tm, &(t->date_max));
+				if(ret > 0)
+				{
+					return;
+				}
+			}
+			ret = write(1, ttail_std_getline_buff(t),
+				sizeof(char)*rd_sz);
+			if(ret < 0)
+			{
+				perror("Unable to write to stdout");
+				return;
+			}
+		}
+		while((rd_sz = ttail_std_getline(t)) > 0);
+	}
+	if(rd_sz < 0)
+	{
+		tmp = errno;
+		ret = feof(stdin);
+		if(ret <= 0)
+		{
+			errno = tmp;
+			perror("Error while reading loglines from stdin");
+		}
+	}
+	return;
+}
+
+void _ttail_search_stdin_free(ttail_t* t)
+{
+	if(t->session->std.buff)
+	{
+		free(t->session->std.buff);
+	}
+}
+