Initial commit

src/dateformats.c

@@ -1,42 +0,0 @@
-#include "include/dateformats.h"
-
-ttail_datefmt** ttail_date_fmt_init(ttail_options *options)
-{
-	ttail_datefmt **res;
-	size_t i;
-	
-	i = 1;
-	#ifdef TTAIL_FMT_REGEX
-	i++;
-	#endif
-
-	res = malloc(sizeof(ttail_datefmt*)*i);
-	if(!res)
-	{
-		perror("Fails to allocate formats");
-		goto ttail_date_fmt_init_alloc_err;
-	}
-	i--;
-	res[i] = NULL;
-	#ifdef TTAIL_FMT_REGEX
-	res[i] = ttail_fmt_regex_init(options);
-	if(!res[i])
-	{
-		goto ttail_date_fmt_init_err;
-	}
-	i--;
-	#endif
-
-	return res;
-
-	ttail_date_fmt_init_err:
-	i++;
-	while(res[i]!=NULL)
-	{
-		res[i]->cleanup(res[i]);
-	}
-	free(res);
-
-	ttail_date_fmt_init_alloc_err:
-	return NULL;
-}

src/fmt_regex.c

@@ -1,26 +0,0 @@
-#include "include/fmt_regex.h"
-
-ttail_datefmt* ttail_fmt_regex_init(ttail_options* options)
-{
-	ttail_datefmt *res;
-
-	res = malloc(sizeof(ttail_datefmt));
-	if(!res)
-	{
-		perror("Failed to allocate the dateformat");
-		goto ttail_fmt_regex_init_malloc_err;
-	}
-	res->name = malloc(sizeof(char)*(sizeof(TTAIL_FMT_REGEX_NAME)));
-	if(!res->name)
-	{
-		perror("Failed to allocate the dateformat name");
-		goto ttail_fmt_regex_init_err;
-	}
-
-	return res;
-
-	ttail_fmt_regex_init_err:
-		free(res);
-	ttail_fmt_regex_init_malloc_err:
-		return NULL;
-}

src/include/dateformats.h

@@ -1,101 +0,0 @@
-#ifndef _ttail_dateformats_h__
-#define _ttail_dateformats_h__
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <errno.h>
-
-#include "options.h"
-#include "config.h"
-
-#define TTAIL_NODATE_A 2
-#define TTAIL_NODATE_B 4
-
-
-#define TTAIL_FMTNAME_SZ 16
-
-
-typedef struct _ttail_datefmt_s ttail_datefmt;
-
-//<! Datetime format info
-typedef void* ttail_fmt_infos;
-
-/**@brief Dateformat detection function
- *@param const char* logline
- *@return Datetime format info or TTAIL_NODETECT if detection fails
- */
-typedef ttail_fmt_infos (*ttail_detect_f)(const char*);
-
-/**@brief Comparison results
- *
- * -1 if a < b, 1 if a > b, 0 if a == b, -2 if exception
- *
- * If an exception occur, exception flags are set with | on the result.
- * Exceptions flags are : TTAIL_NODATE_A and TTAIL_NODATE_B
- */
-typedef int ttail_cmp_res;
-
-/**@brief Loglines comparison function
- *@param ttail_fmt_infos datetime returned from a ttail_detect_f
- *@param const char* logline a
- *@param const char* logline b
- *@return -1 if a < b, 1 if a > b, 0 if a == b, -2 if exception
- *@see ttail_cmp_res
- */
-typedef ttail_cmp_res (*ttail_cmp_f)(ttail_fmt_infos, const char*, const char*);
-
-///<! Date detection infos free function
-typedef void (*ttail_free_infos_f)(ttail_fmt_infos);
-
-///<! ttail_datefmt cleanup function
-typedef void (*ttail_fmt_cleanup_f)(ttail_datefmt*);
-
-/**@brief ttail_datefmt initalisation function
- *@param ttail_options* options
- *@return NULL on error
- */
-typedef ttail_datefmt* (*ttail_fmt_init_f)(ttail_options*);
-
-/**@brief Stores a datetime format
- *
- * Represent a ttail dateformat.
- *
- * A dateformat provides functions for detection, sorting etc. of a date
- * and time in a logline
- */
-struct _ttail_datefmt_s
-{
-	///<! Format name
-	char *name;
-
-	///<! format initalisation function
-	ttail_fmt_init_f init;
-	///<! @brief Detection function
-	ttail_detect_f detect;
-	///<! @brief Comparison function
-	ttail_cmp_f cmp;
-	///<! @brief Datetime infos free function
-	ttail_free_infos_f date_free_infos;
-	///<! cleanup function
-	ttail_fmt_cleanup_f cleanup;
-
-	///<! internal format datas
-	void *_blob;
-};
-
-/**@brief Given a name of date format load the shared library and
- *build the format list calling the formats init functions
- *
- *@param const char **fmt_name_l format name list
- *@param size_t fmt_sz format name list size
- *@param ttail_optionts* options ttail_runtime options
- *@return NULL on error else a NULL terminated ttail_datefmt list
- */
-ttail_datefmt** ttail_date_fmt_init(ttail_options* options);
-
-#ifdef TTAIL_FMT_REGEX
-extern ttail_datefmt* ttail_fmt_regex_init(ttail_options* options);
-#endif
-
-#endif

src/include/fmt_regex.h

@@ -1,20 +0,0 @@
-#include "config.h"
-#ifdef TTAIL_FMT_REGEX
-#ifndef _ttail_fmt_regex_h__
-#define _ttail_fmt_regex_h__
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-#include <regex.h>
-#include <sys/types.h>
-
-#include "dateformats.h"
-#include "options.h"
-
-#define TTAIL_FMT_REGEX_NAME "regex"
-
-ttail_datefmt* ttail_fmt_regex_init(ttail_options* options);
-
-#endif
-#endif

src/include/options.h

@@ -1,18 +0,0 @@
-#ifndef _ttail_options_h__
-#define _ttail_options_h__
-
-#include <stdio.h>
-
-struct _ttail_options_s
-{
-	///<! NULL terminated format list
-	char **fmt_list;
-};
-
-typedef struct _ttail_options_s ttail_options;
-
-ttail_options *ttail_options_init(int argc, char **argv);
-
-void ttail_options_free(ttail_options*);
-
-#endif

src/include/ttail.h

@@ -2,28 +2,57 @@
 #define _ttail_h__
 
 #include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <getopt.h>
+#include <time.h>
+#include <regex.h>
+#include <sys/types.h>
 
-#include "options.h"
-#include "dateformats.h"
 
-struct _ttail_runtime_s
+struct _ttail_s
 {
-	///<! Date formats
-	ttail_datefmt *fmt_l;
+	char **logfile_name; /*!< logfiles name */
+	FILE **logfile; /*!< logfiles pointers */
+	size_t logfile_sz; /*<! logfiles count */
+	
+	/*! A regex matching the datetime prefix in loglines */
+	regex_t date_prefix;
+	int date_prefix_flag;
 
-	///<! Formats count
-	size_t fmt_sz;
+	/*! A strptime format matching datetime in logfile */
+	char *fmt;
 
-	///<! Runtime options
-	ttail_options *options;
+	int verbose;
 };
-typedef struct _ttail_runtime_s ttail_runtime_t;
+typedef struct _ttail_s ttail_t;
 
-/**@brief Init ttail lib
- *
- *Initialise the TTAIL_date_fmts and set the options
+
+/**@brief Parse cli arguments and return a ttail_t
+ *@param int argc
+ *@param char** argv
+ *@return NULL on error
+ */
+ttail_t *ttail_init(int argc, char **argv);
+
+/**@brief Add a logfile
+ *@param ttail_t*
+ *@param const char * filename
+ *@return 0 if no errors -1 if fatal error
  */
-ttail_runtime_t *ttail_init(int argc, char **argv);
+int ttail_add_logfile(ttail_t*, const char*);
+
+/**@brief Set a date prefix regex
+ *@param ttail_t*
+ *@param const char * regex
+ *@return 0 if no errors
+ */
+int ttail_set_prefix(ttail_t*, const char*);
+
+void ttail_free(ttail_t*);
+
 
 #endif

src/ttail.c

@@ -1,29 +1,193 @@
 #include "include/ttail.h"
 
-ttail_runtime_t* ttail_init(int argc, char **argv)
+ttail_t *ttail_init(int argc, char **argv)
 {
-	ttail_runtime_t *res;
-	
-	res = malloc(sizeof(ttail_runtime_t));
+	ttail_t *res;
+	int c, opt_i, ret;
+
+	res = malloc(sizeof(ttail_t));
 	if(!res)
 	{
-		perror("Unable to allocate memory for runtime");
-		goto ttail_init_malloc_err;
+		perror("Unable to allocate memory");
+		goto ttail_init_alloc_err;
 	}
-	res->options = ttail_options_init(argc, argv);
-	if(!res->options)
+
+	opterr = 0;
+	res->verbose = 0;
+	res->fmt = NULL;
+	regfree(&(res->date_prefix));
+	res->date_prefix_flag = 0;
+	res->logfile = NULL;
+	res->logfile_name = NULL;
+	res->logfile_sz = 0;
+
+	while(1)
 	{
-		goto ttail_init_opt_err;
+		static struct option long_options[] =
+		{
+			{"verbose", no_argument, 0, 'v'},
+			{"re-prefix", required_argument, 0, 'p'},
+			{"date-format", required_argument, 0, 'd'},
+			{"file", required_argument, 0, 'f'},
+		};
+		opt_i = 0;
+		c = getopt_long(argc, argv, "p:f:d:", long_options, &opt_i);
+		if(c == -1)
+			break;
+		
+		switch(c)
+		{
+			case 'v':
+				res->verbose++;
+				break;
+			case 'p':
+				if(ttail_set_prefix(res, optarg) < 0)
+				{
+					goto ttail_init_err;
+				}
+				break;
+			case 'd':
+				if(res->fmt)
+				{
+					fprintf(stderr,"Warning : multiple\
+date format given\n");
+				}
+				res->fmt = malloc(
+					sizeof(char)*(strlen(optarg)+1));
+				if(!res->fmt)
+				{
+					perror("Unable to allocate memory\
+for date format");
+					goto ttail_init_err;
+				}
+				strcpy(res->fmt, optarg);
+
+				break;
+			case 'f':
+				ret = ttail_add_logfile(res, optarg);
+				if(ret < 0)
+				{
+					goto ttail_init_err;
+				}
+				break;
+		}
 	}
-	
 
-	ttail_init_opt_err:
-		free(res);
-	ttail_init_malloc_err:
-		return NULL;
+	return res;
+
+	ttail_init_err:
+	ttail_free(res);
+	ttail_init_alloc_err:
+	return NULL;
 }
 
-int main(int argc, char **argv)
+int ttail_add_logfile(ttail_t* res, const char* filename)
 {
+	void *tmp;
+	FILE *fp;
+	char *fname;
+	res->logfile_sz++;
+	tmp = res->logfile;
+	res->logfile = realloc(res->logfile,
+		sizeof(FILE*)*res->logfile_sz);
+	if(!res->logfile)
+	{
+		perror("Unable to allocate memory for logfiles");
+		res->logfile = tmp;
+		goto ttail_add_logfile_fpalloc_err;
+	}
+	fp = fopen(optarg, "r");
+	if(!fp)
+	{
+		fprintf(stderr, "Unable to open file : %s", filename);
+	}
+	res->logfile[res->logfile_sz-1] = fp;
+
+	tmp = res->logfile_name;
+	res->logfile_name = realloc(res->logfile_name,
+		sizeof(char*)*res->logfile_sz);
+	if(!res->logfile_name)
+	{
+		perror("Unable to allocate memory for logfiles");
+		res->logfile_name = tmp;
+		goto ttail_add_logfile_fnalloc_err;
+
+	}
+	fname = malloc(sizeof(char)*(strlen(filename)+1));
+	if(!fname)
+	{
+		perror("Unable to allocate memory for logfiles");
+		goto ttail_add_logfile_fnalloc_err;
+	}
+	strcpy(fname, filename);
+	res->logfile_name[res->logfile_sz-1] = fname;
+	
 	return 0;
+
+	ttail_add_logfile_fnalloc_err:
+	fclose(res->logfile[res->logfile_sz-2]);
+	ttail_add_logfile_fpalloc_err:
+	res->logfile_sz--;
+	return -1;
 }
+
+int ttail_set_prefix(ttail_t* res, const char* regex)
+{
+	int ret;
+	char *re_errbuff;
+	size_t re_errbuff_sz;
+
+	if(res->date_prefix_flag)
+	{
+		fprintf(stderr, "Warning : Regex prefix allready set");
+		return 0;
+	}
+	res->date_prefix_flag = 1;
+	ret = regcomp(&res->date_prefix, regex, 0);
+	if(!ret)
+	{
+		return 0;
+	}
+	/*compilation error */
+	re_errbuff_sz = regerror(ret,
+		&res->date_prefix, NULL, 0);
+	re_errbuff = malloc(
+		sizeof(char)*re_errbuff_sz);
+	if(!re_errbuff)
+	{
+		perror("Failed to allocate memory for regex compilation \
+error message");
+		goto ttail_set_prefix_err;
+	}
+	regerror(ret, &res->date_prefix,
+		re_errbuff,
+		sizeof(char)*re_errbuff_sz);
+	fprintf(stderr, "Regex compilation fails : %s", re_errbuff);
+
+	free(re_errbuff);
+	ttail_set_prefix_err:
+	return -1;
+}
+
+void ttail_free(ttail_t* t)
+{
+	size_t i;
+	for(i=0; i<t->logfile_sz; i++)
+	{
+		if(t->logfile[i])
+		{
+			fclose(t->logfile[i]);
+		}
+		if(t->logfile_name[i])
+		{
+			free(t->logfile_name[i]);
+		}
+	}
+	t->logfile_sz = 0;
+	if(t->fmt != NULL)
+	{
+		free(t->fmt);
+	}
+	free(t);
+}
+