X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=linux.c;h=f9b2ec69c888ed96ded15ad177126116ff97af20;hb=ec4b55ae25c368e30a5db6ab6cb33bb6abeca46c;hp=9ffdc91ba08189bc9bb242b2db7eb1175f227fdb;hpb=ea17bfca3d955fdf976ec13a0d6c3bb6a9f3b9e9;p=libserialport.git

diff --git a/linux.c b/linux.c
index 9ffdc91..f9b2ec6 100644
--- a/linux.c
+++ b/linux.c
@@ -22,8 +22,10 @@
 
 SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 {
-	/* Description limited to 127 char,
-	   anything longer would not be user friendly anyway */
+	/*
+	 * Description limited to 127 char, anything longer
+	 * would not be user friendly anyway.
+	 */
 	char description[128];
 	int bus, address;
 	unsigned int vid, pid;
@@ -34,14 +36,19 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 	char *ptr, *dev = port->name + 5;
 	FILE *file;
 	int i, count;
+	struct stat statbuf;
 
 	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);
+	if (lstat(file_name, &statbuf) == -1)
+		RETURN_ERROR(SP_ERR_ARG, "Device not found");
+	if (!S_ISLNK(statbuf.st_mode))
+		snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s/device", dev);
 	count = readlink(file_name, file_name, sizeof(file_name));
-	if (count <= 0 || count >= (int) sizeof(file_name)-1)
-		RETURN_ERROR(SP_ERR_ARG, "Device not found.");
+	if (count <= 0 || count >= (int)(sizeof(file_name) - 1))
+		RETURN_ERROR(SP_ERR_ARG, "Device not found");
 	file_name[count] = 0;
 	if (strstr(file_name, "bluetooth"))
 		port->transport = SP_TRANSPORT_BLUETOOTH;
@@ -49,7 +56,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 		port->transport = SP_TRANSPORT_USB;
 
 	if (port->transport == SP_TRANSPORT_USB) {
-		for (i=0; i<5; i++) {
+		for (i = 0; i < 5; i++) {
 			strcat(sub_dir, "../");
 
 			snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "busnum");
@@ -137,7 +144,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 
 			/* If present, add serial to description for better identification. */
 			if (port->usb_serial && strlen(port->usb_serial)) {
-				snprintf(description, sizeof(description) - 1,
+				snprintf(description, sizeof(description),
 					"%s - %s", port->description, port->usb_serial);
 				if (port->description)
 					free(port->description);
@@ -174,20 +181,25 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 	struct serial_struct serial_info;
 	int ioctl_result;
 #endif
-	char buf[sizeof(entry.d_name) + 16];
+	char buf[sizeof(entry.d_name) + 23];
 	int len, fd;
 	DIR *dir;
 	int ret = SP_OK;
+	struct stat statbuf;
 
 	DEBUG("Enumerating tty devices");
 	if (!(dir = opendir("/sys/class/tty")))
-		RETURN_FAIL("could not open /sys/class/tty");
+		RETURN_FAIL("Could not open /sys/class/tty");
 
 	DEBUG("Iterating over results");
 	while (!readdir_r(dir, &entry, &result) && result) {
 		snprintf(buf, sizeof(buf), "/sys/class/tty/%s", entry.d_name);
+		if (lstat(buf, &statbuf) == -1)
+			continue;
+		if (!S_ISLNK(statbuf.st_mode))
+			snprintf(buf, sizeof(buf), "/sys/class/tty/%s/device", entry.d_name);
 		len = readlink(buf, target, sizeof(target));
-		if (len <= 0 || len >= (int) sizeof(target)-1)
+		if (len <= 0 || len >= (int)(sizeof(target) - 1))
 			continue;
 		target[len] = 0;
 		if (strstr(target, "virtual"))
@@ -195,12 +207,14 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 		snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
 		DEBUG_FMT("Found device %s", name);
 		if (strstr(target, "serial8250")) {
-			/* The serial8250 driver has a hardcoded number of ports.
+			/*
+			 * The serial8250 driver has a hardcoded number of ports.
 			 * The only way to tell which actually exist on a given system
-			 * is to try to open them and make an ioctl call. */
+			 * is to try to open them and make an ioctl call.
+			 */
 			DEBUG("serial8250 device, attempting to open");
 			if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY)) < 0) {
-				DEBUG("open failed, skipping");
+				DEBUG("Open failed, skipping");
 				continue;
 			}
 #ifdef HAVE_SERIAL_STRUCT
@@ -213,7 +227,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 				continue;
 			}
 			if (serial_info.type == PORT_UNKNOWN) {
-				DEBUG("port type is unknown, skipping");
+				DEBUG("Port type is unknown, skipping");
 				continue;
 			}
 #endif
@@ -221,7 +235,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 		DEBUG_FMT("Found port %s", name);
 		*list = list_append(*list, name);
 		if (!list) {
-			SET_ERROR(ret, SP_ERR_MEM, "list append failed");
+			SET_ERROR(ret, SP_ERR_MEM, "List append failed");
 			break;
 		}
 	}