Added slcand daemon contributed by Robert Haddon <robert.haddon@verari.com>

[sojka/can-utils.git] / log2asc.c

diff --git a/log2asc.c b/log2asc.c
index f26b3a385df854e0bc6feb45642bfde8fc120f72..6a10f50c942757e35ac160f25543459e5c55e96c 100644 (file)
--- a/log2asc.c
+++ b/log2asc.c
@@ -56,6 +56,8 @@
 
 #include "lib.h"
 
+#define BUFSZ 400 /* for one line in the logfile */
+
 extern int optind, opterr, optopt;
 
 void print_usage(char *prg)
@@ -69,7 +71,7 @@ void print_usage(char *prg)
 
 int main(int argc, char **argv)
 {
-       char buf[100], device[100], ascframe[100], id[10];
+       static char buf[BUFSZ], device[BUFSZ], ascframe[BUFSZ], id[10];
 
        struct can_frame cf;
        static struct timeval tv, start_tv;
@@ -77,7 +79,7 @@ int main(int argc, char **argv)
        FILE *outfile = stdout;
        static int maxdev, devno, i, crlf, d4, opt;
 
-       while ((opt = getopt(argc, argv, "I:O:4n")) != -1) {
+       while ((opt = getopt(argc, argv, "I:O:4n?")) != -1) {
                switch (opt) {
                case 'I':
                        infile = fopen(optarg, "r");
@@ -103,6 +105,11 @@ int main(int argc, char **argv)
                        d4 = 1;
                        break;
 
+               case '?':
+                       print_usage(basename(argv[0]));
+                       return 0;
+                       break;
+
                default:
                        fprintf(stderr, "Unknown option %c\n", opt);
                        print_usage(basename(argv[0]));
@@ -121,10 +128,22 @@ int main(int argc, char **argv)
        
        //printf("Found %d CAN devices!\n", maxdev);
 
-       while (fgets(buf, 99, infile)) {
+       while (fgets(buf, BUFSZ-1, infile)) {
+
+               if (strlen(buf) >= BUFSZ-2) {
+                       fprintf(stderr, "line too long for input buffer\n");
+                       return 1;
+               }
+
+               /* check for a comment line */
+               if (buf[0] != '(')
+                       continue;
+
                if (sscanf(buf, "(%ld.%ld) %s %s", &tv.tv_sec, &tv.tv_usec,
-                          device, ascframe) != 4)
+                          device, ascframe) != 4) {
+                       fprintf(stderr, "incorrect line format in logfile\n");
                        return 1;
+               }
 
                if (!start_tv.tv_sec) { /* print banner */
                        start_tv = tv;