ttail_logline2date() implementation

src/include/ttail_search.h

@@ -74,7 +74,7 @@ ttail_cmp_res ttail_cmp_logline(ttail_t*, const char*, struct tm*);
  *@param ttail_t* ttail
  *@param const char* logline
  *@param struct tm* tm will be set to extracted date if not NULL
- *@return 0 if ok, -1 if error
+ *@return 0 if ok, -1 if error 1 if no date found
  */
 int ttail_logline2date(ttail_t*, const char*, struct tm*);
 
@@ -85,18 +85,4 @@ int ttail_logline2date(ttail_t*, const char*, struct tm*);
  */
 const char* ttail_logline_subst(ttail_t*, const char*);
 
-/**@brief Regex logline prefix substitution
- *@param ttail_t* ttail
- *@param const char* logline
- *@return a pointer on the end of the subst string
- */
-const char* _ttail_logline_subst_re(ttail_t*, const char*);
-
-/**@brief Static len logline prefix substitution
- *@param ttail_t* ttail
- *@param const char* logline
- *@return a pointer on the end of the subst string
- */
-const char* _ttail_logline_subst_len(ttail_t*, const char*);
-
 #endif

src/ttail_init.c

@@ -159,6 +159,11 @@ int ttail_init_check(ttail_t* t)
 		fprintf(stderr, "No date format set nor detected. Abording.\n");
 		return -1;
 	}
+	else if(!t->fmt)
+	{
+		fprintf(stderr, "Date format flag set but no format found\n");
+		return -1;
+	}
 	return 0;
 }
 

src/ttail_search.c

@@ -28,8 +28,18 @@ int _ttail_search_closest_stdin(ttail_t* t)
 
 int ttail_logline2date(ttail_t* ttail, const char* logline, struct tm* tm)
 {
-	ttail_logline_subst(ttail, logline);
-	return 0;
+	const char *subst, *ret;
+
+	memset(tm, 0,sizeof(struct tm));
+
+	subst = ttail_logline_subst(ttail, logline);
+	if(!subst)
+	{
+		return 1;
+	}
+	fprintf(stderr, "FORMAT : %s\n", ttail->fmt);
+	ret = strptime(subst, ttail->fmt, tm);
+	return ret?0:1;
 }
 
 const char* ttail_logline_subst(ttail_t* t, const char* logline)