diff options
| author | Simon Peeters <peeters.simon@gmail.com> | 2014-01-04 02:35:23 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-01-05 00:59:13 -0500 |
| commit | b68fa010f72599e6da5822feda5ae3a47a4e63d8 (patch) | |
| tree | 046694049da4187b5a8bbe85d4bca92960f2fa3e /src/shared/util.c | |
| parent | 9dddaedfcc70c6dc37ba6a48d1d8e27e12c0cb2e (diff) | |
shared: procfs_file_alloca: handle pid==0
when pid is set to 0 use /proc/self
Diffstat (limited to 'src/shared/util.c')
| -rw-r--r-- | src/shared/util.c | 35 |
1 files changed, 7 insertions, 28 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index f491708f4f..50dac70804 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -495,10 +495,7 @@ int get_starttime_of_pid(pid_t pid, unsigned long long *st) { assert(pid >= 0); assert(st); - if (pid == 0) - p = "/proc/self/stat"; - else - p = procfs_file_alloca(pid, "stat"); + p = procfs_file_alloca(pid, "stat"); f = fopen(p, "re"); if (!f) @@ -573,10 +570,7 @@ int get_process_comm(pid_t pid, char **name) { assert(name); assert(pid >= 0); - if (pid == 0) - p = "/proc/self/comm"; - else - p = procfs_file_alloca(pid, "comm"); + p = procfs_file_alloca(pid, "comm"); r = read_one_line_file(p, name); if (r == -ENOENT) @@ -594,10 +588,7 @@ int get_process_cmdline(pid_t pid, size_t max_length, bool comm_fallback, char * assert(line); assert(pid >= 0); - if (pid == 0) - p = "/proc/self/cmdline"; - else - p = procfs_file_alloca(pid, "cmdline"); + p = procfs_file_alloca(pid, "cmdline"); f = fopen(p, "re"); if (!f) @@ -716,10 +707,7 @@ int get_process_capeff(pid_t pid, char **capeff) { assert(capeff); assert(pid >= 0); - if (pid == 0) - p = "/proc/self/status"; - else - p = procfs_file_alloca(pid, "status"); + p = procfs_file_alloca(pid, "status"); return get_status_field(p, "\nCapEff:", capeff); } @@ -732,10 +720,7 @@ int get_process_exe(pid_t pid, char **name) { assert(pid >= 0); assert(name); - if (pid == 0) - p = "/proc/self/exe"; - else - p = procfs_file_alloca(pid, "exe"); + p = procfs_file_alloca(pid, "exe"); r = readlink_malloc(p, name); if (r < 0) @@ -2549,10 +2534,7 @@ int get_ctty_devnr(pid_t pid, dev_t *d) { assert(pid >= 0); - if (pid == 0) - fn = "/proc/self/stat"; - else - fn = procfs_file_alloca(pid, "stat"); + fn = procfs_file_alloca(pid, "stat"); f = fopen(fn, "re"); if (!f) @@ -5095,10 +5077,7 @@ int getenv_for_pid(pid_t pid, const char *field, char **_value) { assert(field); assert(_value); - if (pid == 0) - path = "/proc/self/environ"; - else - path = procfs_file_alloca(pid, "environ"); + path = procfs_file_alloca(pid, "environ"); f = fopen(path, "re"); if (!f) |