From c260e0744edf4eaa6112548c8526e78dadc1bcea Mon Sep 17 00:00:00 2001
From: dave <dave@davepedu.com>
Date: Wed, 9 May 2018 23:17:26 -0700
Subject: [PATCH] better date parsing method

---
 src/Makefile |  2 +-
 src/main.c   | 24 +++++-------------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index b40642e..f416948 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,4 @@
-CC=gcc
+CC=gcc -Wall
 CFLAGS=-g -I.
 DEPS=
 OBJ=main.o
diff --git a/src/main.c b/src/main.c
index 2a714e6..aa41dd3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,26 +54,14 @@ int parse_message(struct Message* result, char* message) {
     if (num_digits == 0) return 1; // empty priority <> ?
     result->priority = atoi(digits);
 
-
     // Parse date
     // May 10 03:09:59 filterlog: 5,,,....
     char month[8];
     memset(&month, '\0', sizeof(month));  // makes valgrind happy as the above char contains uninitialized memory
-    int day, hour, minute, second;
-    {
-        int msg_len = strlen(message);
-        char message_fromdate[4096];
-        memset(&message_fromdate, '\0', sizeof(message_fromdate));
-        memcpy(message_fromdate, &message[position], msg_len - position);
-        if(sscanf(message_fromdate, "%s %d %d:%d:%d", month, &day, &hour, &minute, &second) != 5) {  // TODO replace this BS with %n like below
-            return 1;  // Failed to parse all desired fields
-        }
-    } // frees message_fromdate, but is this pointless?
-
-    // Advance position by finding the length of the date
-    char datestr[24];
-    int date_length = sprintf(datestr, "%s %d %02d:%02d:%02d", month, day, hour, minute, second);
-    assert(date_length > 0);
+    int day, hour, minute, second, date_length;
+    if(sscanf(message + position, "%s %d %d:%d:%d%n", month, &day, &hour, &minute, &second, &date_length) != 5) {
+        return 1;  // Failed to parse all desired fields
+    }
     position += date_length + 1;  // position now at beginning of HOSTNAME field
 
     // char msg_remaining[4096];
@@ -84,7 +72,6 @@ int parse_message(struct Message* result, char* message) {
     // memmove(message, &message[position], strlen(message) - position);
     // printf("'%s'\n", message);
 
-
     // Parse APPLICATION
     // filterlog: 5,,,1000000103,cpsw0,match....
     char application[64];  // TODO check max length
@@ -96,13 +83,12 @@ int parse_message(struct Message* result, char* message) {
     memcpy(result->application, application, sizeof(application));
 
     position += app_length + 1;
-    printf("remaining: '%s'\n", message + position + 1);
 
+    printf("remaining: '%s'\n", message + position);
     return 0;
 }
 
 
-
 int main(int argc, char** argv) {
     int sock_fd;
     struct sockaddr_in my_addr, my_peer_addr;