diff options
Diffstat (limited to 'bbot/agent')
-rw-r--r-- | bbot/agent/agent.cxx | 12 | ||||
-rw-r--r-- | bbot/agent/machine.cxx | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/bbot/agent/agent.cxx b/bbot/agent/agent.cxx index 80eeae5..2c4e03e 100644 --- a/bbot/agent/agent.cxx +++ b/bbot/agent/agent.cxx @@ -93,9 +93,9 @@ inline void run_btrfs (tracer& t, A&&... a) { if (verb >= 4) - run_io (t, fdnull (), 2, 2, "btrfs", forward<A> (a)...); + run_io (t, fdopen_null (), 2, 2, "btrfs", forward<A> (a)...); else - run_io (t, fdnull (), fdnull (), 2, "btrfs", forward<A> (a)...); + run_io (t, fdopen_null (), fdopen_null (), 2, "btrfs", forward<A> (a)...); } template <typename... A> @@ -103,8 +103,10 @@ inline butl::process_exit::code_type btrfs_exit (tracer& t, A&&... a) { return verb >= 4 - ? run_io_exit (t, fdnull (), 2, 2, "btrfs", forward<A> (a)...) - : run_io_exit (t, fdnull (), fdnull (), 2, "btrfs", forward<A> (a)...); + ? run_io_exit (t, fdopen_null (), 2, 2, "btrfs", forward<A> (a)...) + : run_io_exit (t, + fdopen_null (), fdopen_null (), 2, + "btrfs", forward<A> (a)...); } // Bootstrap the machine. Return the bootstrapped machine manifest if @@ -1194,7 +1196,7 @@ try throw_generic_error (ENOENT); openssl os (trace, - ops.auth_key (), path ("-"), fdnull (), + ops.auth_key (), path ("-"), fdopen_null (), ops.openssl (), "rsa", ops.openssl_option (), "-pubout", "-outform", "DER"); diff --git a/bbot/agent/machine.cxx b/bbot/agent/machine.cxx index 9b205cc..41d124c 100644 --- a/bbot/agent/machine.cxx +++ b/bbot/agent/machine.cxx @@ -36,7 +36,7 @@ namespace bbot { string addr (iface_addr (br)); - auto_fd fdn (ignore_errors ? fdnull () : nullfd); + auto_fd fdn (ignore_errors ? fdopen_null () : nullfd); int ofd (ignore_errors ? fdn.get () : 2); process_exit::code_type e; |