can-utils: AOSP build clean up

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

diff --git a/log2long.c b/log2long.c
index 6563911a7faa31f017f32ea1b73610decd128d86..2c52c784a18f4484510b34f0504535fb47df9f95 100644 (file)
--- a/log2long.c
+++ b/log2long.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * log2long.c - convert compact CAN frame representation into user readable
  *
@@ -41,7 +37,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
  * DAMAGE.
  *
- * Send feedback to <socketcan-users@lists.berlios.de>
+ * Send feedback to <linux-can@vger.kernel.org>
  *
  */
 
@@ -52,17 +48,33 @@
 
 #include "lib.h"
 
+#define COMMENTSZ 200
+#define BUFSZ (sizeof("(1345212884.318850)") + IFNAMSIZ + 4 + CL_CFSZ + COMMENTSZ) /* for one line in the logfile */
+
 int main(int argc, char **argv)
 {
-       char buf[100], timestamp[100], device[100], ascframe[100];
-       struct can_frame cf;
+       char buf[BUFSZ], timestamp[BUFSZ], device[BUFSZ], ascframe[BUFSZ];
+       struct canfd_frame cf;
+       int mtu, maxdlen;
 
-       while (fgets(buf, 99, stdin)) {
+       while (fgets(buf, BUFSZ-1, stdin)) {
                if (sscanf(buf, "%s %s %s", timestamp, device, ascframe) != 3)
                        return 1;
-               if (parse_canframe(ascframe, &cf))
+
+               mtu = parse_canframe(ascframe, &cf);
+               if (mtu == CAN_MTU)
+                       maxdlen = CAN_MAX_DLEN;
+               else if (mtu == CANFD_MTU)
+                       maxdlen = CANFD_MAX_DLEN;
+               else {
+                       fprintf(stderr, "read: incomplete CAN frame\n");
                        return 1;
-               sprint_long_canframe(ascframe, &cf, 1); /* with ASCII output */
+               }
+
+               sprint_long_canframe(ascframe, &cf,
+                                    (CANLIB_VIEW_INDENT_SFF | CANLIB_VIEW_ASCII),
+                                    maxdlen); /* with ASCII output */
+
                printf("%s  %s  %s\n", timestamp, device, ascframe);
        }