From a82cc2f34bddae9b79e582a3bcc6b2c9cbb5009b Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Wed, 27 Jun 2018 03:51:35 +0000
Subject: driver, library interfaces: support alternate fd's for
 input/output/error/log.

---
 src/logic/slbt_exec_uninstall.c | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

(limited to 'src/logic/slbt_exec_uninstall.c')

diff --git a/src/logic/slbt_exec_uninstall.c b/src/logic/slbt_exec_uninstall.c
index 1168c7d..b733d27 100644
--- a/src/logic/slbt_exec_uninstall.c
+++ b/src/logic/slbt_exec_uninstall.c
@@ -21,6 +21,7 @@
 #include "argv/argv.h"
 
 static int slbt_uninstall_usage(
+	int				fdout,
 	const char *			program,
 	const char *			arg,
 	const struct argv_option **	optv,
@@ -33,7 +34,7 @@ static int slbt_uninstall_usage(
 		"Options:\n",
 		program);
 
-	argv_usage(STDOUT_FILENO,header,optv,arg);
+	argv_usage(fdout,header,optv,arg);
 	argv_free(meta);
 
 	return SLBT_USAGE;
@@ -245,6 +246,7 @@ int slbt_exec_uninstall(
 	struct slbt_exec_ctx *		ectx)
 {
 	int				ret;
+	int				fdout;
 	char **				argv;
 	char **				iargv;
 	uint32_t			flags;
@@ -269,6 +271,7 @@ int slbt_exec_uninstall(
 	slbt_reset_arguments(ectx);
 	slbt_disable_placeholders(ectx);
 	iargv = ectx->cargv;
+	fdout = slbt_driver_fdout(dctx);
 
 	/* work around non-conforming uses of --mode=uninstall */
 	if (!(strcmp(iargv[0],"/bin/sh")) || !strcmp(iargv[0],"/bin/bash"))
@@ -278,16 +281,18 @@ int slbt_exec_uninstall(
 	argv_optv_init(slbt_uninstall_options,optv);
 
 	if (!iargv[1] && (dctx->cctx->drvflags & SLBT_DRIVER_VERBOSITY_USAGE))
-		return slbt_uninstall_usage(dctx->program,0,optv,0);
+		return slbt_uninstall_usage(
+			fdout,
+			dctx->program,
+			0,optv,0);
 
 	/* <uninstall> argv meta */
 	if (!(meta = argv_get(
-			iargv,
-			optv,
+			iargv,optv,
 			dctx->cctx->drvflags & SLBT_DRIVER_VERBOSITY_ERRORS
 				? ARGV_VERBOSITY_ERRORS
 				: ARGV_VERBOSITY_NONE,
-			STDERR_FILENO)))
+			fdout)))
 		return slbt_exec_uninstall_fail(
 			actx,meta,
 			SLBT_CUSTOM_ERROR(dctx,SLBT_ERR_UNINSTALL_FAIL));
@@ -329,7 +334,10 @@ int slbt_exec_uninstall(
 
 	/* --help */
 	if (flags & SLBT_UNINSTALL_HELP) {
-		slbt_uninstall_usage(dctx->program,0,optv,meta);
+		slbt_uninstall_usage(
+			fdout,
+			dctx->program,
+			0,optv,meta);
 		return 0;
 	}
 
-- 
cgit v1.2.3