Add compat wrapper for readlinkat

This commit is contained in:
Benny Baumann 2020-10-29 23:02:57 +01:00
parent 84dad4c38e
commit 2d6da2e520
3 changed files with 34 additions and 19 deletions

View File

@ -13,9 +13,7 @@ in the source distribution for its full text.
#include <sys/stat.h> #include <sys/stat.h>
#include "Compat.h" #include "Compat.h"
#ifndef HAVE_FSTATAT
#include "XUtils.h" #include "XUtils.h"
#endif
int Compat_fstatat(int dirfd, int Compat_fstatat(int dirfd,
@ -44,3 +42,27 @@ int Compat_fstatat(int dirfd,
#endif #endif
} }
int Compat_readlinkat(int dirfd,
const char* dirpath,
const char* pathname,
char* buf,
size_t bufsize) {
#ifdef HAVE_READLINKAT
(void)dirpath;
return readlinkat(dirfd, pathname, buf, bufsize);
#else
(void)dirfd;
char path[4096];
xSnprintf(path, sizeof(path), "%s/%s", dirpath, pathname);
return readlink(path, buf, bufsize);
#endif
}

View File

@ -7,6 +7,7 @@ Released under the GNU GPLv2, see the COPYING file
in the source distribution for its full text. in the source distribution for its full text.
*/ */
#include <stddef.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -16,4 +17,10 @@ int Compat_fstatat(int dirfd,
struct stat* statbuf, struct stat* statbuf,
int flags); int flags);
int Compat_readlinkat(int dirfd,
const char* dirpath,
const char* pathname,
char* buf,
size_t bufsize);
#endif /* HEADER_Compat */ #endif /* HEADER_Compat */

View File

@ -23,6 +23,7 @@ in the source distribution for its full text.
#include <sys/wait.h> #include <sys/wait.h>
#include "CRT.h" #include "CRT.h"
#include "Compat.h"
#include "FunctionBar.h" #include "FunctionBar.h"
#include "IncSet.h" #include "IncSet.h"
#include "ProcessList.h" #include "ProcessList.h"
@ -104,26 +105,11 @@ static char *ProcessLocksScreen_getInodeFilename(pid_t pid, ino_t inode) {
if (!strtoull(de->d_name, (char **) NULL, 10)) if (!strtoull(de->d_name, (char **) NULL, 10))
continue; continue;
#if !defined(HAVE_FSTATAT) || !defined(HAVE_READLINKAT) if (!Compat_fstatat(fd, path, de->d_name, &sb, 0) && inode != sb.st_ino)
char filepath[PATH_MAX + 1];
xSnprintf(filepath, sizeof(filepath), "%s/%s", path, de->d_name);
#endif
#ifdef HAVE_FSTATAT
if (!fstatat(fd, de->d_name, &sb, 0) && inode != sb.st_ino)
continue; continue;
#else
if (!stat(filepath, &sb)) && inode != sb.st_ino)
continue;
#endif
#ifdef HAVE_READLINKAT if ((len = Compat_readlinkat(fd, path, de->d_name, sym, sizeof(sym) - 1)) < 1)
if ((len = readlinkat(fd, de->d_name, sym, sizeof(sym) - 1)) < 1)
goto out; goto out;
#else
if ((len = readlink(filepath, sym, sizeof(sym) - 1)) < 1)
goto out;
#endif
sym[len] = '\0'; sym[len] = '\0';