diff options
| author | Richard Jones <rjones@trick.home.annexia.org> | 2009-09-17 16:44:20 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@trick.home.annexia.org> | 2009-09-17 16:58:09 +0100 |
| commit | d5fad33b4eaa39722ea1dc96de9446ffc4805e01 (patch) | |
| tree | 61e7b245494ff6e3ba27a9b8bc25df96b232e53d | |
| parent | da0a4f8d1f6ddd302ceba028d87c6e009589e503 (diff) | |
Fix code which looked for leaked FDs between each command.
This code was not checking the return value from system()
so it failed if uncommented. Add ignore_value() around the
call to system. However, leave the code still disabled.
| -rw-r--r-- | daemon/m4/gnulib-cache.m4 | 3 | ||||
| -rw-r--r-- | daemon/proto.c | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/daemon/m4/gnulib-cache.m4 b/daemon/m4/gnulib-cache.m4 index ea499d86..bd6cf61d 100644 --- a/daemon/m4/gnulib-cache.m4 +++ b/daemon/m4/gnulib-cache.m4 @@ -15,12 +15,13 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=gl hash manywarnings warnings +# gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --with-tests --no-libtool --macro-prefix=gl hash ignore-value manywarnings warnings # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([]) gl_MODULES([ hash + ignore-value manywarnings warnings ]) diff --git a/daemon/proto.c b/daemon/proto.c index c0e39275..c22bbee4 100644 --- a/daemon/proto.c +++ b/daemon/proto.c @@ -29,6 +29,8 @@ #include <rpc/types.h> #include <rpc/xdr.h> +#include "ignore-value.h" + #include "daemon.h" #include "../src/guestfs_protocol.h" @@ -53,13 +55,11 @@ main_loop (int _sock) sock = _sock; for (;;) { -#if 0 /* Most common errors are leaked memory and leaked file descriptors, * so run this between each command: */ - if (verbose) - system ("ls -l /proc/self/fd"); -#endif + if (verbose && 0) + ignore_value (system ("ls -l /proc/self/fd")); /* Read the length word. */ if (xread (sock, lenbuf, 4) == -1) |