X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=linux.c;h=8e9bfbf72ccbd1c46e4d0511020eb9f0f11421ed;hb=2b40f8145448dc0ef85ab95b779b83dac939837c;hp=e995347ada193f049e1930ac0afafcc6f754ec29;hpb=0666ccc7ca446ce2960630e2707389852c812284;p=libserialport.git

diff --git a/linux.c b/linux.c
index e995347..8e9bfbf 100644
--- a/linux.c
+++ b/linux.c
@@ -135,6 +135,15 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
 				fclose(file);
 			}
 
+			/* If present, add serial to description for better identification. */
+			if (port->usb_serial && strlen(port->usb_serial)) {
+				snprintf(description, sizeof(description),
+					"%s - %s", port->description, port->usb_serial);
+				if (port->description)
+					free(port->description);
+				port->description = strdup(description);
+			}
+
 			break;
 		}
 	} else {
@@ -165,9 +174,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 	struct serial_struct serial_info;
 	int ioctl_result;
 #endif
-#ifndef HAVE_READLINKAT
 	char buf[sizeof(entry.d_name) + 16];
-#endif
 	int len, fd;
 	DIR *dir;
 	int ret = SP_OK;
@@ -178,12 +185,8 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 
 	DEBUG("Iterating over results");
 	while (!readdir_r(dir, &entry, &result) && result) {
-#ifdef HAVE_READLINKAT
-		len = readlinkat(dirfd(dir), entry.d_name, target, sizeof(target));
-#else
 		snprintf(buf, sizeof(buf), "/sys/class/tty/%s", entry.d_name);
 		len = readlink(buf, target, sizeof(target));
-#endif
 		if (len <= 0 || len >= (int) sizeof(target)-1)
 			continue;
 		target[len] = 0;