Add tests + bugfixes

src/include/ttail.h

@@ -47,7 +47,7 @@ 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
+ *@return 0 if no errors 1 if unable to open file -1 if fatal error
  */
 int ttail_add_logfile(ttail_t*, const char*);
 

src/ttail.c

@@ -68,6 +68,7 @@ for date format");
 
 				break;
 			case 'l':
+				fprintf(stderr,"-l with %s\n", optarg);
 				ret = ttail_add_logfile(res, optarg);
 				if(ret < 0)
 				{
@@ -85,7 +86,7 @@ for date format");
 				dates[c=='d'?0:1] = date;
 				break;
 			case '?':
-				fprintf(stderr, "Bad argument : %S\n", argv[optind]);
+				fprintf(stderr, "Bad argument : %s\n", argv[optind]);
 				goto init_badarg;
 				break;
 			default:
@@ -143,10 +144,23 @@ int ttail_add_logfile(ttail_t* res, const char* filename)
 	void *tmp;
 	FILE *fp;
 	char *fname;
+	int ret, i;
+
+	for(i=0; i<res->logfile_sz; i++)
+	{
+		if(strcmp(filename, res->logfile_name[i]) == 0)
+		{
+			fprintf(stderr, "File '%s' allready added\n",
+				filename);
+			return -1;
+		}
+	}
+
 	res->logfile_sz++;
 	tmp = res->logfile;
 	res->logfile = realloc(res->logfile,
 		sizeof(FILE*)*res->logfile_sz);
+	ret = 0;
 	if(!res->logfile)
 	{
 		perror("Unable to allocate memory for logfiles");
@@ -157,6 +171,7 @@ int ttail_add_logfile(ttail_t* res, const char* filename)
 	if(!fp)
 	{
 		fprintf(stderr, "Unable to open file : %s\n", filename);
+		ret = 1;
 	}
 	res->logfile[res->logfile_sz-1] = fp;
 
@@ -179,7 +194,7 @@ int ttail_add_logfile(ttail_t* res, const char* filename)
 	strcpy(fname, filename);
 	res->logfile_name[res->logfile_sz-1] = fname;
 	
-	return 0;
+	return ret;
 
 	ttail_add_logfile_fnalloc_err:
 	fclose(res->logfile[res->logfile_sz-2]);

tests/Makefile.am

@@ -1,6 +1,10 @@
-TESTS = ttail_argparse_check
-check_PROGRAMS = ttail_argparse_check
+TESTS = ttail_argparse_check ttail_init_check
+check_PROGRAMS = ttail_argparse_check ttail_init_check
 
 ttail_argparse_check_SOURCES = ttail_argparse_check.c
 ttail_argparse_check_CFLAGS = @CHECK_CFLAGS@
 ttail_argparse_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@
+
+ttail_init_check_SOURCES = ttail_init_check.c
+ttail_init_check_CFLAGS = @CHECK_CFLAGS@
+ttail_init_check_LDADD =  $(top_builddir)/src/libttail.a @CHECK_LIBS@

tests/ttail_argparse_check.c

@@ -82,7 +82,7 @@ void setup_fname(void)
 			{
 				perror("Unable to create file for testing");
 				ck_abort_msg("Unable to create file for testing");
-			} else { printf("Created : %s\n", fname[i]);}
+			}
 			if(fclose(fp))
 			{
 				perror("Unable to close file for testing");

tests/ttail_init_check.c

@@ -0,0 +1,150 @@
+#include <check.h>
+#include <errno.h>
+#include <stdio.h>
+#include <unistd.h>
+
+
+#include "ttail.h"
+
+ttail_t *ttail;
+#define __Fname_sz 5
+#define FNAME_NO_EXIST 0
+#define FNAME_EXIST 1
+char *fname[__Fname_sz];
+
+void teardown_ttail(void)
+{
+	ttail_free(ttail);
+}
+void setup_ttail_empty(void)
+{
+	ttail = ttail_init(1, (char**)&"foo");
+}
+START_TEST (test_init_empty_logfilename)
+{
+	ck_assert_msg(ttail->logfile_name == NULL,
+		"ttail_t.logfile_name should be NULL");
+}
+END_TEST
+
+START_TEST (test_init_nonexist_logfilename)
+{
+	char *fname;
+	int ret;
+	fname = tempnam(NULL, "ttail_check");
+
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, 1);
+	ck_assert(ttail->logfile_name != NULL);
+	ck_assert_str_eq(ttail->logfile_name[0], fname);
+	ck_assert(ttail->logfile[0] == NULL);
+	free(fname);
+}
+END_TEST
+
+START_TEST (test_init_exist_logfilename)
+{
+	char *fname;
+	int ret;
+	FILE *fp;
+	fname = tempnam(NULL, "ttail_check");
+	if(!(fp = fopen(fname, "w+")))
+	{
+		perror("Unable to create file for testing");
+		ck_abort_msg("Unable to create file for testing");
+	}
+	if(fclose(fp))
+	{
+		perror("Unable to close file for testing");
+		ck_abort_msg("Unabe to close file for testing");
+	}
+
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, 0);
+	ck_assert(ttail->logfile_name != NULL);
+	ck_assert_str_eq(ttail->logfile_name[0], fname);
+	ck_assert(ttail->logfile[0] != NULL);
+	free(fname);
+}
+END_TEST
+
+START_TEST (test_init_same_exist_logfilename)
+{
+	char *fname;
+	int ret;
+	FILE *fp;
+	fname = tempnam(NULL, "ttail_check");
+	if(!(fp = fopen(fname, "w+")))
+	{
+		perror("Unable to create file for testing");
+		ck_abort_msg("Unable to create file for testing");
+	}
+	if(fclose(fp))
+	{
+		perror("Unable to close file for testing");
+		ck_abort_msg("Unabe to close file for testing");
+	}
+
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, 0);
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, -1);
+	ck_assert_int_eq(ttail->logfile_sz, 1);
+	ck_assert(ttail->logfile_name != NULL);
+	ck_assert_str_eq(ttail->logfile_name[0], fname);
+	ck_assert(ttail->logfile[0] != NULL);
+	free(fname);
+}
+END_TEST
+
+START_TEST (test_init_same_nonexist_logfilename)
+{
+	char *fname;
+	int ret;
+	fname = tempnam(NULL, "ttail_check");
+
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, 1);
+	ret = ttail_add_logfile(ttail, fname);
+	ck_assert_int_eq(ret, -1);
+	ck_assert_int_eq(ttail->logfile_sz, 1);
+	ck_assert(ttail->logfile_name != NULL);
+	ck_assert_str_eq(ttail->logfile_name[0], fname);
+	ck_assert(ttail->logfile[0] == NULL);
+	free(fname);
+}
+END_TEST
+
+Suite * ttail_init_suite(void)
+{
+	Suite *s;
+	TCase *tc_init_logfile;
+
+	s = suite_create("ttail init checks");
+
+	tc_init_logfile = tcase_create("logfile init checks");
+	tcase_add_checked_fixture(tc_init_logfile,
+		setup_ttail_empty, teardown_ttail);
+	tcase_add_test(tc_init_logfile, test_init_empty_logfilename);
+	tcase_add_test(tc_init_logfile, test_init_nonexist_logfilename);
+	tcase_add_test(tc_init_logfile, test_init_exist_logfilename);
+	tcase_add_test(tc_init_logfile, test_init_same_exist_logfilename);
+	tcase_add_test(tc_init_logfile, test_init_same_nonexist_logfilename);
+	suite_add_tcase(s, tc_init_logfile);
+	return s;
+}
+
+int main(void)
+{
+	int number_failed = 0;
+	SRunner *sr;
+
+	sr = srunner_create(ttail_init_suite());
+	srunner_set_fork_status(sr, CK_FORK);
+
+	srunner_run_all(sr,CK_VERBOSE);
+	number_failed = srunner_ntests_failed(sr);
+	srunner_free(sr);
+	return (number_failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+
+}