From 31885cd5e38ec9807a6a7ab32660cf8c2fcf48f7 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Wed, 17 Apr 2013 17:19:38 -0400 Subject: core/killall: use procfs_file_alloca --- src/core/killall.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'src/core') diff --git a/src/core/killall.c b/src/core/killall.c index e078012c1b..a0f57455fb 100644 --- a/src/core/killall.c +++ b/src/core/killall.c @@ -32,8 +32,7 @@ #define TIMEOUT_USEC (10 * USEC_PER_SEC) static bool ignore_proc(pid_t pid) { - char buf[PATH_MAX]; - FILE *f; + _cleanup_fclose_ FILE *f = NULL; char c; size_t count; uid_t uid; @@ -51,15 +50,11 @@ static bool ignore_proc(pid_t pid) { if (uid != 0) return false; - snprintf(buf, sizeof(buf), "/proc/%lu/cmdline", (unsigned long) pid); - char_array_0(buf); - - f = fopen(buf, "re"); + f = fopen(procfs_file_alloca(pid, "cmdline"), "re"); if (!f) return true; /* not really, but has the desired effect */ count = fread(&c, 1, 1, f); - fclose(f); /* Kernel threads have an empty cmdline */ if (count <= 0) -- cgit v1.2.3-54-g00ecf