Enhancement & changes in arguments parsing

add a -h --help option, deleted -l --logfile options
+ spliting the ttail_search_closest() & ttail_search_print_res() functions

src/include/ttail_init.h

@@ -14,6 +14,7 @@
 
 #include "ttail.h"
 
+/**@todo set logfiles as "leadings" option */
 #define TTAIL_LONG_OPT {\
 	{"verbose", no_argument, 0, 'v'},\
 	{"re-prefix", required_argument, 0, 'r'},\
@@ -23,9 +24,10 @@
 	{"date-format", required_argument, 0, 'f'},\
 	{"date-min", required_argument, 0, 'd'},\
 	{"date-max", required_argument, 0, 'm'},\
-	{"logfile", required_argument, 0, 'l'},\
+	{"help", no_argument, 0, 'h'},\
 	{0,	0,	0,	0 }\
 }
+#define TTAIL_SHORT_OPT "vr:Eip:f:d:l:m:h"
 
 #define TTAIL_OPT_HELP {\
 	{"Augment the verbosity level",NULL},\
@@ -37,12 +39,10 @@ POSIX) ",NULL},\
 	{"Set the date format (see man strptime for supported date formats"\
 ,"FORMAT"},\
 	{"Start to output loglines starting from this date","DATE"},\
-	{"Not implemented","DATE"},\
-	{"Indicate logfiles","FILE"},\
-	{"",NULL},\
+	{"Stop to output loglines before this date","DATE"},\
+	{"Print this help and exit",NULL},\
 	{"",NULL}\
 }
-#define TTAIL_SHORT_OPT "r:EIp:f:d:l:m:"
 
 /**<! Print help & usage */
 void usage();
@@ -52,9 +52,9 @@ void usage();
  *@param char** argv
  *@return NULL on error
  */
-ttail_t *ttail_init(int argc, char **argv);
+ttail_t *ttail_init(int, char**);
 
-/**@brief Checks that init lead to a valid runtime
+/**@brief Checks that init returns a valid ttail_t runtime
  *@param ttail_t* t
  *@return 0 if no error -1 if fatal error
  */

src/include/ttail_search.h

@@ -49,6 +49,11 @@ union _ttail_search_u
  */
 int ttail_search_closest(ttail_t*, const struct tm*);
 
+/**@brief Print search result on t->out_fd
+ *@param ttail_t*
+ */
+void ttail_search_print_res(ttail_t*);
+
 /**@brief @ref ttail_search_closest() implementation for stdin
  *@param ttail_t*
  *@param struct tm* tmin

src/main.c

@@ -22,6 +22,16 @@ int main(int argc, char **argv)
 		return 1;
 	}
 	res = ttail_search_closest(ttail, &(ttail->date_min));
+	if(res < 0)
+	{
+		fprintf(stderr, "Error while searching through files\n");
+		return 1;
+	}
+	else if (res == 1)
+	{
+		return 0; /* not found, no line to print */
+	}
+	ttail_search_print_res(ttail);
 	ttail_free(ttail);
 	return res;
 }

src/ttail_init.c

@@ -5,7 +5,7 @@ void usage()
 	static struct option opts[] = TTAIL_LONG_OPT;
 	static char *help[][2] = TTAIL_OPT_HELP;
 	size_t i;
-	printf("Usage : ttail -d DATE [OPTIONS]\n");
+	printf("Usage : ttail -d DATE [OPTIONS] [LOGFILES]\n");
 	printf("\t\n");
 	printf("Options list\n");
 	i=0;
@@ -29,12 +29,15 @@ void usage()
 		printf("\t\t%s\n\n", help[i][0]);
 		i++;
 	}
+	printf("\tLOGFILES\n\t\tLogfiles, can take '-' as value to tell ttail \
+to read from stdin instead of files\n");
 }
 
 ttail_t *ttail_init(int argc, char **argv)
 {
 	ttail_t *res;
 	int c, opt_i, ret;
+	size_t i;
 	char *dates[2] = { NULL, NULL };
 	char *date;
 
@@ -118,13 +121,9 @@ given\n");
 				}
 
 				break;
-			case 'l':
-				ret = ttail_add_logfile(res, optarg);
-				if(ret < 0)
-				{
-					goto ttail_init_err;
-				}
-				break;
+			case 'h':
+				usage();
+				goto ttail_init_err;
 			case 'd':
 			case 'm':
 				date = malloc(sizeof(char)*(strlen(optarg)+1));
@@ -146,16 +145,13 @@ given\n");
 		}
 	}
 	
-	if(optind < argc)
+	for(i=optind; i<argc; i++)
 	{
-		init_badarg:
-		fprintf(stderr, "bad option :");
-		while(optind < argc)
+		ret = ttail_add_logfile(res, argv[i]);
+		if(ret < 0)
 		{
-			fprintf(stderr, argv[optind++]);
+			goto ttail_init_err;
 		}
-		fprintf(stderr, "\n");
-		goto ttail_init_err;
 	}
 
 	if(ttail_set_dates(res, dates) < 0)
@@ -164,7 +160,8 @@ given\n");
 	}
 
 	return res;
-
+	init_badarg:
+	fprintf(stderr, "Unknown option '%s'\n", argv[optind]);
 	ttail_init_err:
 	if(dates[0]) { free(dates[0]); }
 	if(dates[1]) { free(dates[1]); }
@@ -194,10 +191,6 @@ given as argument\n");
 			return -1;
 		}
 	}
-	if(t->flag & TTAIL_FLAG_DATE_MAX)
-	{
-		fprintf(stderr, "Warning : date-max not yet implemented\n");
-	}
 	if(!(t->flag & TTAIL_FLAG_DATE_MIN))
 	{
 		fprintf(stderr, "--date-min -d is mandatory\n");

src/ttail_search.c

@@ -8,37 +8,31 @@ int ttail_search_closest(ttail_t* ttail, const struct tm *tm)
 		fprintf(stderr, "A session is allready started\n");
 		return -1;
 	}
-	/*
-	ttail->session = (ttail_search_t*)malloc(ttail->logfile_sz?
-		sizeof(ttail_search_file_t):sizeof(ttail_search_stdin_t));
-	if(!ttail->session)
-	{
-		perror("Unable to allocate memory for search session");
-		return -1;
-	}
-	*/
 	ret = ttail->logfile_sz?\
 		_ttail_search_closest_files(ttail, tm):\
 		_ttail_search_closest_stdin(ttail, tm);
 	if(ret < 0)
 	{
-		fprintf(stderr, "Error will searching\n");
 		return -1;
 	}
 	if(ret > 0)
 	{
 		return ret;
 	}
-	if(ttail->logfile_sz)
+	return 0;
+}
+
+void ttail_search_print_res(ttail_t* t)
+{
+	if(t->logfile_sz)
 	{
-		_ttail_search_print_files(ttail, 1);
-		_ttail_search_file_free(ttail);
+		_ttail_search_print_files(t, 1);
+		_ttail_search_file_free(t);
 	}
 	else
 	{
-		_ttail_search_print_stdin(ttail, 1);
+		_ttail_search_print_stdin(t, 1);
 	}
-	return 0;
 }
 
 int _ttail_search_closest_stdin(ttail_t* t, const struct tm* tm)