diff options
| author | Christian Göttsche <cgzones@googlemail.com> | 2022-08-09 20:59:10 +0200 |
|---|---|---|
| committer | BenBE <BenBE@geshi.org> | 2022-08-09 22:15:19 +0200 |
| commit | 2f62ee0698792c06ee698475049c8d8f03e0e73c (patch) | |
| tree | 4d74f7f29d9c624f9e282da03ea78ae29e7b68a4 /linux/LinuxProcessList.c | |
| parent | 8e19b2a2c5655c132a3b41f9a911471dd32914d4 (diff) | |
Linux: support openat() without readlinkat()
linux/LinuxProcessList.c:1094:52: error: format specifies type 'char *' but the argument has type 'openat_arg_t' (aka 'int') [-Werror,-Wformat]
xSnprintf(filename, sizeof(filename), "%s/cwd", procFd);
~~ ^~~~~~
%d
linux/LinuxProcessList.c:1333:44: error: format specifies type 'char *' but the argument has type 'openat_arg_t' (aka 'int') [-Werror,-Wformat]
xSnprintf(path, sizeof(path), "%s/exe", procFd);
~~ ^~~~~~
%d
Supersedes: #1025
Diffstat (limited to 'linux/LinuxProcessList.c')
| -rw-r--r-- | linux/LinuxProcessList.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c index 45b045c8..0ed2e4f7 100644 --- a/linux/LinuxProcessList.c +++ b/linux/LinuxProcessList.c @@ -1090,9 +1090,7 @@ static void LinuxProcessList_readCwd(LinuxProcess* process, openat_arg_t procFd) #if defined(HAVE_READLINKAT) && defined(HAVE_OPENAT) ssize_t r = readlinkat(procFd, "cwd", pathBuffer, sizeof(pathBuffer) - 1); #else - char filename[MAX_NAME + 1]; - xSnprintf(filename, sizeof(filename), "%s/cwd", procFd); - ssize_t r = readlink(filename, pathBuffer, sizeof(pathBuffer) - 1); + ssize_t r = Compat_readlink(procFd, "cwd", pathBuffer, sizeof(pathBuffer) - 1); #endif if (r < 0) { @@ -1329,9 +1327,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, openat_arg_t proc #if defined(HAVE_READLINKAT) && defined(HAVE_OPENAT) amtRead = readlinkat(procFd, "exe", filename, sizeof(filename) - 1); #else - char path[4096]; - xSnprintf(path, sizeof(path), "%s/exe", procFd); - amtRead = readlink(path, filename, sizeof(filename) - 1); + amtRead = Compat_readlink(procFd, "exe", filename, sizeof(filename) - 1); #endif if (amtRead > 0) { filename[amtRead] = 0; |