* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <config.h>
#include "libserialport.h"
#include "libserialport_internal.h"
+/*
+ * The 'e' modifier for O_CLOEXEC is glibc >= 2.7 only, hence not
+ * portable, so provide an own wrapper for this functionality.
+ */
+static FILE *fopen_cloexec_rdonly(const char *pathname)
+{
+ int fd;
+ if ((fd = open(pathname, O_RDONLY | O_CLOEXEC)) < 0)
+ return NULL;
+ return fdopen(fd, "r");
+}
+
SP_PRIV enum sp_return get_port_details(struct sp_port *port)
{
/*
char manufacturer[128], product[128], serial[128];
char baddr[32];
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;
FILE *file;
int i, count;
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)
+ snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s", dev);
+ if (lstat(link_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));
+ snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s/device", dev);
+ count = readlink(link_name, file_name, sizeof(file_name));
if (count <= 0 || count >= (int)(sizeof(file_name) - 1))
RETURN_ERROR(SP_ERR_ARG, "Device not found");
file_name[count] = 0;
strcat(sub_dir, "../");
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "busnum");
- if (!(file = fopen(file_name, "r")))
+ if (!(file = fopen_cloexec_rdonly(file_name)))
continue;
count = fscanf(file, "%d", &bus);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "devnum");
- if (!(file = fopen(file_name, "r")))
+ if (!(file = fopen_cloexec_rdonly(file_name)))
continue;
count = fscanf(file, "%d", &address);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idVendor");
- if (!(file = fopen(file_name, "r")))
+ if (!(file = fopen_cloexec_rdonly(file_name)))
continue;
count = fscanf(file, "%4x", &vid);
fclose(file);
continue;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "idProduct");
- if (!(file = fopen(file_name, "r")))
+ if (!(file = fopen_cloexec_rdonly(file_name)))
continue;
count = fscanf(file, "%4x", &pid);
fclose(file);
port->usb_pid = pid;
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
- if ((file = fopen(file_name, "r"))) {
+ if ((file = fopen_cloexec_rdonly(file_name))) {
if ((ptr = fgets(description, sizeof(description), file))) {
ptr = description + strlen(description) - 1;
if (ptr >= description && *ptr == '\n')
port->description = strdup(dev);
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "manufacturer");
- if ((file = fopen(file_name, "r"))) {
+ if ((file = fopen_cloexec_rdonly(file_name))) {
if ((ptr = fgets(manufacturer, sizeof(manufacturer), file))) {
ptr = manufacturer + strlen(manufacturer) - 1;
if (ptr >= manufacturer && *ptr == '\n')
}
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "product");
- if ((file = fopen(file_name, "r"))) {
+ if ((file = fopen_cloexec_rdonly(file_name))) {
if ((ptr = fgets(product, sizeof(product), file))) {
ptr = product + strlen(product) - 1;
if (ptr >= product && *ptr == '\n')
}
snprintf(file_name, sizeof(file_name), dir_name, dev, sub_dir, "serial");
- if ((file = fopen(file_name, "r"))) {
+ if ((file = fopen_cloexec_rdonly(file_name))) {
if ((ptr = fgets(serial, sizeof(serial), file))) {
ptr = serial + strlen(serial) - 1;
if (ptr >= serial && *ptr == '\n')
if (port->transport == SP_TRANSPORT_BLUETOOTH) {
snprintf(file_name, sizeof(file_name), dir_name, dev, "", "address");
- if ((file = fopen(file_name, "r"))) {
+ if ((file = fopen_cloexec_rdonly(file_name))) {
if ((ptr = fgets(baddr, sizeof(baddr), file))) {
ptr = baddr + strlen(baddr) - 1;
if (ptr >= baddr && *ptr == '\n')
SP_PRIV enum sp_return list_ports(struct sp_port ***list)
{
char name[PATH_MAX], target[PATH_MAX];
- struct dirent entry, *result;
+ struct dirent *entry;
#ifdef HAVE_STRUCT_SERIAL_STRUCT
struct serial_struct serial_info;
int ioctl_result;
#endif
- char buf[sizeof(entry.d_name) + 23];
+ char buf[sizeof(entry->d_name) + 23];
int len, fd;
DIR *dir;
int ret = SP_OK;
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);
+ while ((entry = readdir(dir))) {
+ 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);
+ 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;
target[len] = 0;
if (strstr(target, "virtual"))
continue;
- snprintf(name, sizeof(name), "/dev/%s", entry.d_name);
+ snprintf(name, sizeof(name), "/dev/%s", entry->d_name);
DEBUG_FMT("Found device %s", name);
if (strstr(target, "serial8250")) {
/*
* 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) {
+ if ((fd = open(name, O_RDWR | O_NONBLOCK | O_NOCTTY | O_CLOEXEC)) < 0) {
DEBUG("Open failed, skipping");
continue;
}
}
DEBUG_FMT("Found port %s", name);
*list = list_append(*list, name);
- if (!list) {
+ if (!*list) {
SET_ERROR(ret, SP_ERR_MEM, "List append failed");
break;
}
projects / libserialport.git / blobdiff