diff options
author | Sebastian Schmidt <sschmidt@interhyp.de> | 2013-08-18 10:42:11 (GMT) |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2013-08-18 10:59:57 (GMT) |
commit | 0f686d436e5e18d6f40fecc01128d3f383439b35 (patch) | |
tree | 216818d27e1a65ad92c374dd0df7d9518161a913 | |
parent | d5677d9b42562b429218dd9436efd5f0e79d7929 (diff) | |
download | monitoring-plugins-0f686d436e5e18d6f40fecc01128d3f383439b35.tar.gz |
check_procs: Get rid of HAVE_PROC_PID_EXE
Don't check for /proc/pid/exe at compile time, it could be gone in a
build chroot or the like. Checking at runtime (once) is sufficient.
-rw-r--r-- | configure.in | 6 | ||||
-rw-r--r-- | plugins/check_procs.c | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/configure.in b/configure.in index 7efcb0f..43fe4ad 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1632,12 +1632,6 @@ if test -n "$ac_cv_proc_meminfo"; then | |||
1632 | EXTRAS="$EXTRAS check_swap" | 1632 | EXTRAS="$EXTRAS check_swap" |
1633 | fi | 1633 | fi |
1634 | 1634 | ||
1635 | AC_MSG_CHECKING([for /proc/pid/exe]) | ||
1636 | if [readlink /proc/$$/exe > /dev/null 2>&1]; then | ||
1637 | AC_MSG_RESULT([found]) | ||
1638 | AC_DEFINE(HAVE_PROC_PID_EXE,1,[Define if we have /proc/pid/exe]) | ||
1639 | fi | ||
1640 | |||
1641 | AC_PATH_PROG(PATH_TO_DIG,dig) | 1635 | AC_PATH_PROG(PATH_TO_DIG,dig) |
1642 | AC_ARG_WITH(dig_command, | 1636 | AC_ARG_WITH(dig_command, |
1643 | ACX_HELP_STRING([--with-dig-command=PATH], | 1637 | ACX_HELP_STRING([--with-dig-command=PATH], |
diff --git a/plugins/check_procs.c b/plugins/check_procs.c index d6441f0..3b4c822 100644 --- a/plugins/check_procs.c +++ b/plugins/check_procs.c | |||
@@ -110,7 +110,7 @@ FILE *ps_input = NULL; | |||
110 | 110 | ||
111 | static int | 111 | static int |
112 | stat_exe (const pid_t pid, struct_stat_t *buf) { | 112 | stat_exe (const pid_t pid, struct_stat_t *buf) { |
113 | #if defined(HAVE_PROC_PID_EXE) && defined(HAVE_SYS_STAT_H) | 113 | #ifdef HAVE_SYS_STAT_H |
114 | char *path; | 114 | char *path; |
115 | int ret; | 115 | int ret; |
116 | xasprintf(&path, "/proc/%d/exe", pid); | 116 | xasprintf(&path, "/proc/%d/exe", pid); |