picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

process-util: make sure procfs_file_alloca() works for non-literal field names too

Browse source
This commit is contained in:
Lennart Poettering 2020-07-14 16:59:22 +02:00
parent 56870d324b
commit a07f18cd30
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/basic/process-util.h
View file

@ -20,14 +20,16 @@
#define procfs_file_alloca(pid, field) \
({ \
pid_t _pid_ = (pid); \
const char *_r_; \
const char *_field_ = (field); \
char *_r_; \
if (_pid_ == 0) { \
_r_ = ("/proc/self/" field); \
_r_ = newa(char, STRLEN("/proc/self/") + strlen(_field_) + 1); \
strcpy(stpcpy(_r_, "/proc/self/"), _field_); \
} else { \
_r_ = newa(char, STRLEN("/proc/") + DECIMAL_STR_MAX(pid_t) + 1 + sizeof(field)); \
sprintf((char*) _r_, "/proc/"PID_FMT"/" field, _pid_); \
_r_ = newa(char, STRLEN("/proc/") + DECIMAL_STR_MAX(pid_t) + 1 + strlen(_field_) + 1); \
sprintf(_r_, "/proc/" PID_FMT "/%s", _pid_, _field_); \
} \
_r_; \
(const char*) _r_; \
})
typedef enum ProcessCmdlineFlags {