Build: Use GNUMAKEFLAGS and $@

[libserialport.git] / linux.c

diff --git a/linux.c b/linux.c
index d2cf1294646f1a7a7b1e4fd6fca1f5dcc11aa2bc..1531f9276a7ae70cd9965e181b23623d7f4ca831 100644 (file)
--- a/linux.c
+++ b/linux.c
@@ -1,6 +1,7 @@
 /*
  * This file is part of the libserialport project.
  *
+ * Copyright (C) 2013 Martin Ling <martin-libserialport@earth.li>
  * Copyright (C) 2014 Aurelien Jacobs <aurel@gnuage.org>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -36,11 +37,16 @@ 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");
 
        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");
@@ -172,14 +178,15 @@ 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
+#ifdef HAVE_STRUCT_SERIAL_STRUCT
        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")))
@@ -188,6 +195,10 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
        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))
                        continue;
@@ -207,11 +218,11 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
                                DEBUG("Open failed, skipping");
                                continue;
                        }
-#ifdef HAVE_SERIAL_STRUCT
+#ifdef HAVE_STRUCT_SERIAL_STRUCT
                        ioctl_result = ioctl(fd, TIOCGSERIAL, &serial_info);
 #endif
                        close(fd);
-#ifdef HAVE_SERIAL_STRUCT
+#ifdef HAVE_STRUCT_SERIAL_STRUCT
                        if (ioctl_result != 0) {
                                DEBUG("ioctl failed, skipping");
                                continue;