mirror/libserialport
mirror/libserialport
1
0
Fork 0
mirror of git://sigrok.org/libserialport synced 2023-08-10 21:13:24 +03:00
Code Issues Projects Releases Wiki Activity

linux: remove readlinkat() dependency

Browse Source
This commit is contained in:
Aurelien Jacobs 2014-09-04 20:13:55 +02:00
parent 546e9ae5c5
commit 653cef3ab1
3 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@ -119,9 +119,6 @@ AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed],
AC_CHECK_MEMBERS([struct termios2.c_ispeed, struct termios2.c_ospeed], AC_CHECK_MEMBERS([struct termios2.c_ispeed, struct termios2.c_ospeed],
[AC_DEFINE(HAVE_TERMIOS2_SPEED, 1)], [], [[#include <linux/termios.h>]]) [AC_DEFINE(HAVE_TERMIOS2_SPEED, 1)], [], [[#include <linux/termios.h>]])
# Check for readlinkat.
AC_CHECK_FUNC([readlinkat], [AC_DEFINE(HAVE_READLINKAT, 1)], [])
# Check for serial_struct. # Check for serial_struct.
AC_CHECK_TYPE([struct serial_struct], [AC_DEFINE(HAVE_SERIAL_STRUCT, 1)], AC_CHECK_TYPE([struct serial_struct], [AC_DEFINE(HAVE_SERIAL_STRUCT, 1)],
[], [[#include <linux/serial.h>]]) [], [[#include <linux/serial.h>]])

1
libserialport_internal.h
View File

@ -20,7 +20,6 @@
#ifdef __linux__ #ifdef __linux__
#define _BSD_SOURCE // for timeradd, timersub, timercmp #define _BSD_SOURCE // for timeradd, timersub, timercmp
#define _XOPEN_SOURCE 700 // for readlinkat
#endif #endif
#include <string.h> #include <string.h>

6
linux.c
View File

@ -165,9 +165,7 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
struct serial_struct serial_info; struct serial_struct serial_info;
int ioctl_result; int ioctl_result;
#endif #endif
#ifndef HAVE_READLINKAT
char buf[sizeof(entry.d_name) + 16]; char buf[sizeof(entry.d_name) + 16];
#endif
int len, fd; int len, fd;
DIR *dir; DIR *dir;
int ret = SP_OK; int ret = SP_OK;
@ -178,12 +176,8 @@ SP_PRIV enum sp_return list_ports(struct sp_port ***list)
DEBUG("Iterating over results"); DEBUG("Iterating over results");
while (!readdir_r(dir, &entry, &result) && result) { 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); snprintf(buf, sizeof(buf), "/sys/class/tty/%s", entry.d_name);
len = readlink(buf, target, sizeof(target)); len = readlink(buf, target, sizeof(target));
#endif
if (len <= 0 || len >= (int) sizeof(target)-1) if (len <= 0 || len >= (int) sizeof(target)-1)
continue; continue;
target[len] = 0; target[len] = 0;