slcanpty: declare command buffer static

[can-utils.git] / lib.c

diff --git a/lib.c b/lib.c
index 927f064117533432c7b64bd72694ae0f7f34941d..2755c80f5c14cb190cc9c94072a9eb6108f5d90d 100644 (file)
--- a/lib.c
+++ b/lib.c
@@ -1,7 +1,3 @@
-/*
- *  $Id$
- */
-
 /*
  * lib.c - library for command line tools
  *
@@ -173,6 +169,11 @@ int parse_canframe(char *cs, struct canfd_frame *cf) {
 
        if((cs[idx] == 'R') || (cs[idx] == 'r')){ /* RTR frame */
                cf->can_id |= CAN_RTR_FLAG;
+
+               /* check for optional DLC value for CAN 2.0B frames */
+               if(cs[++idx] && (tmp = asc2nibble(cs[idx])) <= CAN_MAX_DLC)
+                       cf->len = tmp;
+
                return ret;
        }
 
@@ -191,7 +192,7 @@ int parse_canframe(char *cs, struct canfd_frame *cf) {
 
        for (i=0, dlen=0; i < maxdlen; i++){
 
-               if(cs[idx] == DATA_SEPERATOR) /* skip (optional) seperator */
+               if(cs[idx] == DATA_SEPERATOR) /* skip (optional) separator */
                        idx++;
 
                if(idx >= len) /* end of string => end of data */
@@ -240,7 +241,13 @@ void sprint_canframe(char *buf , struct canfd_frame *cf, int sep, int maxdlen) {
 
        /* standard CAN frames may have RTR enabled. There are no ERR frames with RTR */
        if (maxdlen == CAN_MAX_DLEN && cf->can_id & CAN_RTR_FLAG) {
-               sprintf(buf+offset, "R");
+
+               /* print a given CAN 2.0B DLC if it's not zero */
+               if (cf->len && cf->len <= CAN_MAX_DLC)
+                       sprintf(buf+offset, "R%d", cf->len);
+               else
+                       sprintf(buf+offset, "R");
+
                return;
        }
 
@@ -288,8 +295,13 @@ void sprint_long_canframe(char *buf , struct canfd_frame *cf, int view, int maxd
                sprintf(buf, "%08X  ", cf->can_id & CAN_EFF_MASK);
                offset = 10;
        } else {
-               sprintf(buf, "%03X  ", cf->can_id & CAN_SFF_MASK);
-               offset = 5;
+               if (view & CANLIB_VIEW_INDENT_SFF) {
+                       sprintf(buf, "     %03X  ", cf->can_id & CAN_SFF_MASK);
+                       offset = 10;
+               } else {
+                       sprintf(buf, "%03X  ", cf->can_id & CAN_SFF_MASK);
+                       offset = 5;
+               }
        }
 
        if (maxdlen == CAN_MAX_DLEN) {