File splitting

configure.ac

@@ -15,7 +15,7 @@ esac],[debug=false])
 AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
 
 AC_CONFIG_HEADERS([src/include/config.h])
-AC_CONFIG_SRCDIR([src/ttail.c])
+AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_MACRO_DIR([m4])
 
 # Checks for programs.

src/Makefile.am

@@ -1,5 +1,5 @@
 bin_PROGRAMS = ttail
 noinst_LIBRARIES=libttail.a
 
-libttail_a_SOURCES = ttail.c
-ttail_SOURCES = main.c ttail.c
+libttail_a_SOURCES = ttail_init.c
+ttail_SOURCES = main.c ttail_init.c

src/include/ttail.h

@@ -41,53 +41,4 @@ struct _ttail_s
 };
 typedef struct _ttail_s ttail_t;
 
-
-/**@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 Checks that init lead to a valid runtime
- *@param ttail_t* t
- *@return 0 if no error -1 if fatal error
- */
-int ttail_init_check(ttail_t*);
-
-/**@brief Add a logfile
- *@param ttail_t*
- *@param const char * filename
- *@return 0 if no errors 1 if unable to open file -1 if fatal error
- */
-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 1 if allready set -1 if compilation fails
- */
-int ttail_set_prefix(ttail_t*, const char*);
-
-/**@brief Set dates min/max
- *
- *After the call dates are free and set to NULL except if error
- *@param ttail_t ttail instance
- *@param char*[2] dates {min,max} both can be NULL
- *@return -1 if error 0 else
- */
-int ttail_set_dates(ttail_t*, char*[2]);
-
-/**@brief Attempt to guess a dateformat
- *@param ttail_t* ttail if manage to guess set the ttail_t.fmt
- *@param const char* date as a dtring
- *@param struct tm* if non NULL will be set to detected date
- *@return -1 if no guess -2 if fmt already set else id in TTAIL_DEFAULT_FORMATS
- */
-int ttail_format_guess(ttail_t*, const char*, struct tm*);
-
-
-void ttail_free(ttail_t*);
-
-
 #endif

src/include/ttail_init.h

@@ -0,0 +1,65 @@
+#ifndef _ttail_init_h__
+#define _ttail_init_h__
+
+#include <ctype.h>
+#include <errno.h>
+#include <getopt.h>
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "ttail.h"
+
+/**@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 Checks that init lead to a valid runtime
+ *@param ttail_t* t
+ *@return 0 if no error -1 if fatal error
+ */
+int ttail_init_check(ttail_t*);
+
+/**@brief Add a logfile
+ *@param ttail_t*
+ *@param const char * filename
+ *@return 0 if no errors 1 if unable to open file -1 if fatal error
+ */
+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 1 if allready set -1 if compilation fails
+ */
+int ttail_set_prefix(ttail_t*, const char*);
+
+/**@brief Set dates min/max
+ *
+ *After the call dates are free and set to NULL except if error
+ *@param ttail_t ttail instance
+ *@param char*[2] dates {min,max} both can be NULL
+ *@return -1 if error 0 else
+ */
+int ttail_set_dates(ttail_t*, char*[2]);
+
+/**@brief Attempt to guess a dateformat
+ *@param ttail_t* ttail if manage to guess set the ttail_t.fmt
+ *@param const char* date as a dtring
+ *@param struct tm* if non NULL will be set to detected date
+ *@return -1 if no guess -2 if fmt already set else id in TTAIL_DEFAULT_FORMATS
+ */
+int ttail_format_guess(ttail_t*, const char*, struct tm*);
+
+
+void ttail_free(ttail_t*);
+
+
+#endif

src/main.c

@@ -1,4 +1,5 @@
 #include "include/ttail.h"
+#include "include/ttail_init.h"
 
 int main(int argc, char **argv)
 {

src/ttail.c → src/ttail_init.c

@@ -1,4 +1,4 @@
-#include "ttail.h"
+#include "ttail_init.h"
 
 ttail_t *ttail_init(int argc, char **argv)
 {

tests/ttail_argparse_check.c

@@ -5,6 +5,7 @@
 
 
 #include "ttail.h"
+#include "ttail_init.h"
 
 ttail_t *ttail;
 #define __Fname_sz 5

tests/ttail_init_check.c

@@ -3,8 +3,8 @@
 #include <stdio.h>
 #include <unistd.h>
 
-
 #include "ttail.h"
+#include "ttail_init.h"
 
 ttail_t *ttail;
 #define __Fname_sz 5