canutils/slcan: Work with CAN interfaces with names longer than 4 characters.

csanchezdll · xiaoxiang781216 · commit 4fb47a6a6df7 · 2025-04-23T22:30:47.000+08:00
Signed-off-by: Carlos Sanchez &lt;carlossanchez@geotab.com&gt;
diff --git a/canutils/slcan/slcan.c b/canutils/slcan/slcan.c
@@ -137,8 +137,7 @@ static int caninit(char *candev, int *s, struct sockaddr_can *addr,
       syslog(LOG_ERR, "Error opening CAN socket\n");
       return -1;
     }
-  strncpy(ifr.ifr_name, candev, 4);
-  ifr.ifr_name[4] = '\0';
+  strlcpy(ifr.ifr_name, candev, IFNAMSIZ);
   ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name);
   if (!ifr.ifr_ifindex)
     {

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,7 @@ static int caninit(char candev, int s, struct sockaddr_can *addr,`
`137`	`137`	`syslog(LOG_ERR, "Error opening CAN socket\n");`
`138`	`138`	`return -1;`
`139`	`139`	`}`
`140`		`- strncpy(ifr.ifr_name, candev, 4);`
`141`		`- ifr.ifr_name[4] = '\0';`
	`140`	`+ strlcpy(ifr.ifr_name, candev, IFNAMSIZ);`
`142`	`141`	`ifr.ifr_ifindex = if_nametoindex(ifr.ifr_name);`
`143`	`142`	`if (!ifr.ifr_ifindex)`
`144`	`143`	`{`