Enhancement bugfix + tests update

src/include/ttail.h

@@ -54,7 +54,7 @@ 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
+ *@return 0 if no errors 1 if allready set -1 if compilation fails
  */
 int ttail_set_prefix(ttail_t*, const char*);
 

src/ttail.c

@@ -32,7 +32,8 @@ ttail_t *ttail_init(int argc, char **argv)
 			{"date-format", required_argument, 0, 'f'},
 			{"date-min", required_argument, 0, 'd'},
 			{"date-max", required_argument, 0, 'm'},
-			{"logfile", required_argument, 0, 'l'}
+			{"logfile", required_argument, 0, 'l'},
+			{0,	0,	0,	0 }
 		};
 		opt_i = 0;
 		c = getopt_long(argc, argv, "p:f:d:l:m:", long_options, &opt_i);
@@ -45,7 +46,7 @@ ttail_t *ttail_init(int argc, char **argv)
 				res->verbose++;
 				break;
 			case 'p':
-				if(ttail_set_prefix(res, optarg) < 0)
+				if(ttail_set_prefix(res, optarg))
 				{
 					goto ttail_init_err;
 				}
@@ -53,8 +54,9 @@ ttail_t *ttail_init(int argc, char **argv)
 			case 'f':
 				if(res->fmt)
 				{
-					fprintf(stderr,"Warning : multiple\
-date format given\n");
+					fprintf(stderr,"Multiple date format \
+given\n");
+					goto ttail_init_err;
 				}
 				res->fmt = malloc(
 					sizeof(char)*(strlen(optarg)+1));
@@ -86,12 +88,12 @@ for date format");
 				dates[c=='d'?0:1] = date;
 				break;
 			case '?':
-				fprintf(stderr, "Bad argument : %s\n", argv[optind]);
+				optind--;
 				goto init_badarg;
 				break;
 			default:
-				fprintf(stderr, "Bad argument : 0%o\n", c);
-				goto ttail_init_err;
+				fprintf(stderr, "Bad argument\n");
+				goto init_badarg;
 				
 		}
 	}
@@ -105,6 +107,7 @@ for date format");
 			fprintf(stderr, argv[optind++]);
 		}
 		fprintf(stderr, "\n");
+		goto ttail_init_err;
 	}
 
 	for(c=0;c<c;c++)
@@ -211,8 +214,8 @@ int ttail_set_prefix(ttail_t* res, const char* regex)
 
 	if(res->flag & TTAIL_FLAG_PREFIX)
 	{
-		fprintf(stderr, "Warning : Regex prefix allready set");
-		return 0;
+		fprintf(stderr, "Regex prefix allready set");
+		return 1;
 	}
 	res->flag |= TTAIL_FLAG_PREFIX;
 	ret = regcomp(&res->date_prefix, regex, 0);

tests/ttail_argparse_check.c

@@ -60,6 +60,74 @@ START_TEST (test_argparse_empty_verbose)
 }
 END_TEST
 
+/*
+ * Bad arguments
+ */
+
+START_TEST (test_argparse_bad1)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "--sdfsdf"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad2)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-x"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad3)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-p"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad4)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-f"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad5)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-d"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad6)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-m"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_bad7)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-l"};
+	t = ttail_init(2, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+
 /*
  * file argument parsing
  */
@@ -206,12 +274,50 @@ START_TEST (test_argparse_prefix_long)
 }
 END_TEST
 
+START_TEST (test_argparse_prefix_multiple)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "--re-prefix", "^[^ ]+ ", "-p", "^[ -]+ "};
+	t = ttail_init(5, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_fmt_short)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-f", "%m"};
+	t = ttail_init(3, args);
+	ck_assert(t != NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_fmt_long)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "--date-format", "%m"};
+	t = ttail_init(3, args);
+	ck_assert(t != NULL);
+}
+END_TEST
+
+START_TEST (test_argparse_fmt_multiple)
+{
+	ttail_t *t;
+	char *args[] = {"foo", "-f", "%m", "-f", "%d"};
+	t = ttail_init(5, args);
+	ck_assert(t == NULL);
+}
+END_TEST
+
 Suite * ttail_init_suite(void)
 {
 	Suite *s;
 	TCase *tc_argparse_empty;
+	TCase *tc_argparse_badarg;
 	TCase *tc_argparse_files;
 	TCase *tc_argparse_prefix;
+	TCase *tc_argparse_fmt;
 
 	s = suite_create("ttail argument parsing checks");
 
@@ -225,6 +331,15 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_argparse_empty, test_argparse_empty_fmt);
 	tcase_add_test(tc_argparse_empty, test_argparse_empty_verbose);
 
+	tc_argparse_badarg = tcase_create("bad arguments parsing");
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad1);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad2);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad3);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad4);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad5);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad6);
+	tcase_add_test(tc_argparse_badarg, test_argparse_bad7);
+
 	tc_argparse_files = tcase_create("files options parse");
 	tcase_add_checked_fixture(tc_argparse_files,
 		setup_fname, teardown_fname);
@@ -233,12 +348,20 @@ Suite * ttail_init_suite(void)
 	tcase_add_test(tc_argparse_files, test_argparse_file_multiple);
 
 	tc_argparse_prefix = tcase_create("re-prefix arguments parsing");
-	tcase_add_test(tc_argparse_empty, test_argparse_prefix_short);
-	tcase_add_test(tc_argparse_empty, test_argparse_prefix_long);
+	tcase_add_test(tc_argparse_prefix, test_argparse_prefix_short);
+	tcase_add_test(tc_argparse_prefix, test_argparse_prefix_long);
+	tcase_add_test(tc_argparse_prefix, test_argparse_prefix_multiple);
+
+	tc_argparse_fmt = tcase_create("date format arguments parsing");
+	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_short);
+	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_long);
+	tcase_add_test(tc_argparse_fmt, test_argparse_fmt_multiple);
 
 	suite_add_tcase(s, tc_argparse_empty);
+	suite_add_tcase(s, tc_argparse_badarg);
 	suite_add_tcase(s, tc_argparse_files);
 	suite_add_tcase(s, tc_argparse_prefix);
+	suite_add_tcase(s, tc_argparse_fmt);
 	return s;
 }
 

tests/ttail_init_check.c

@@ -174,7 +174,7 @@ START_TEST (test_init_again_prefix)
 	ck_assert_int_eq(ret, 0);
 	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
 	ret = ttail_set_prefix(ttail, "^[^ + ");
-	ck_assert_int_eq(ret, 0);
+	ck_assert_int_eq(ret, 1);
 	ck_assert((ttail->flag & TTAIL_FLAG_PREFIX) == TTAIL_FLAG_PREFIX);
 }
 END_TEST