mirrors
/
libserialport
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux: Fix compile warning on gcc 6+ for readlink() call. 

Fixes #1268.
This commit is contained in:
Martin Ling 2019-12-31 16:50:55 +01:00 committed by Uwe Hermann
parent fa106ef155
commit 9118f753f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
linux.c
View File

@ -46,7 +46,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
char manufacturer[128], product[128], serial[128]; char manufacturer[128], product[128], serial[128];
char baddr[32]; char baddr[32];
const char dir_name[] = "/sys/class/tty/%s/device/%s%s"; const char dir_name[] = "/sys/class/tty/%s/device/%s%s";
char sub_dir[32] = "", file_name[PATH_MAX]; char sub_dir[32] = "", link_name[PATH_MAX], file_name[PATH_MAX];
char *ptr, *dev = port->name + 5; char *ptr, *dev = port->name + 5;
FILE *file; FILE *file;
int i, count; int i, count;
@ -55,12 +55,12 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
if (strncmp(port->name, "/dev/", 5)) if (strncmp(port->name, "/dev/", 5))
RETURN_ERROR(SP_ERR_ARG, "Device name not recognized"); RETURN_ERROR(SP_ERR_ARG, "Device name not recognized");
snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s", dev); snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s", dev);
if (lstat(file_name, &statbuf) == -1) if (lstat(link_name, &statbuf) == -1)
RETURN_ERROR(SP_ERR_ARG, "Device not found"); RETURN_ERROR(SP_ERR_ARG, "Device not found");
if (!S_ISLNK(statbuf.st_mode)) if (!S_ISLNK(statbuf.st_mode))
snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s/device", dev); snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s/device", dev);
count = readlink(file_name, file_name, sizeof(file_name)); count = readlink(link_name, file_name, sizeof(file_name));
if (count <= 0 || count >= (int)(sizeof(file_name) - 1)) if (count <= 0 || count >= (int)(sizeof(file_name) - 1))
RETURN_ERROR(SP_ERR_ARG, "Device not found"); RETURN_ERROR(SP_ERR_ARG, "Device not found");
file_name[count] = 0; file_name[count] = 0;