windows: Always check return value of GetOverlappedResult().

[libserialport.git] / linux.c

diff --git a/linux.c b/linux.c
index 9274e365040ad9f90ee7a6d09cdeaa372afe9571..d2cf1294646f1a7a7b1e4fd6fca1f5dcc11aa2bc 100644 (file)
--- a/linux.c
+++ b/linux.c
@@ -22,10 +22,13 @@
 
 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, vid, pid = -1;
+       int bus, address;
+       unsigned int vid, pid;
        char manufacturer[128], product[128], serial[128];
        char baddr[32];
        const char dir_name[] = "/sys/class/tty/%s/device/%s%s";
@@ -35,12 +38,12 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port)
        int i, count;
 
        if (strncmp(port->name, "/dev/", 5))
-               RETURN_ERROR(SP_ERR_ARG, "Device name not recognized (%s)", port->name);
+               RETURN_ERROR(SP_ERR_ARG, "Device name not recognized");
 
        snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s", 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 (%s)", port->name);
+       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;
@@ -48,7 +51,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");
@@ -134,6 +137,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 {
@@ -160,49 +172,60 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
 {
        char name[PATH_MAX], target[PATH_MAX];
        struct dirent entry, *result;
+#ifdef HAVE_SERIAL_STRUCT
        struct serial_struct serial_info;
-       int len, fd, ioctl_result;
+       int ioctl_result;
+#endif
+       char buf[sizeof(entry.d_name) + 16];
+       int len, fd;
        DIR *dir;
        int ret = SP_OK;
 
        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) {
-               len = readlinkat(dirfd(dir), entry.d_name, target, sizeof(target));
-               if (len <= 0 || len >= (int) sizeof(target)-1)
+               snprintf(buf, sizeof(buf), "/sys/class/tty/%s", entry.d_name);
+               len = readlink(buf, target, sizeof(target));
+               if (len <= 0 || len >= (int)(sizeof(target) - 1))
                        continue;
                target[len] = 0;
                if (strstr(target, "virtual"))
                        continue;
                snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
-               DEBUG("Found device %s", 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
                        ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info);
+#endif
                        close(fd);
+#ifdef HAVE_SERIAL_STRUCT
                        if (ioctl_result != 0) {
                                DEBUG("ioctl failed, skipping");
                                continue;
                        }
                        if (serial_info.type == PORT_UNKNOWN) {
-                               DEBUG("port type is unknown, skipping");
+                               DEBUG("Port type is unknown, skipping");
                                continue;
                        }
+#endif
                }
-               DEBUG("Found port %s", name);
+               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;
                }
        }