From e558d5871bc448de02102c648d001f4f3570b34c Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Mon, 12 Oct 2020 13:09:41 +0200
Subject: [PATCH] Move argument-hiding magic together with argument parsing

Everything else Finit does related to parsing the incoming arguments
is in conf.c, so it makes sense for this block to also reside there.
---
 src/conf.c  | 18 ++++++++++++++++++
 src/finit.c | 13 -------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/conf.c b/src/conf.c
index c15e4b1e..4d9c95dc 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -59,6 +59,22 @@ static TAILQ_HEAD(head, conf_change) conf_change_list = TAILQ_HEAD_INITIALIZER(c
 static int parse_conf(char *file);
 static void drop_changes(void);
 
+static void hide_args(int argc, char *argv[])
+{
+	/*
+	 * Hide command line arguments from ps (in particular for
+	 * forked children that don't execv()).  This is an ugly
+	 * hack that only works on Linux.
+	 * https://web.archive.org/web/20110227041321/http://netsplit.com/2007/01/10/hiding-arguments-from-ps/
+	 */
+	if (argc > 1) {
+		char *arg_end;
+
+		arg_end = argv[argc-1] + strlen (argv[argc-1]);
+		*arg_end = ' ';
+	}
+}
+
 static void parse_arg(char *arg, int *dbg)
 {
 	/* Catches finit_debug (deprecated), --debug, and debug */
@@ -84,6 +100,8 @@ void conf_parse_cmdline(int argc, char *argv[])
 	for (int i = 1; i < argc; i++)
 		parse_arg(argv[i], &dbg);
 
+	hide_args(argc, argv);
+
 	fp = fopen("/proc/cmdline", "r");
 	if (!fp)
 		goto done;
diff --git a/src/finit.c b/src/finit.c
index 584c5a58..e7e778ea 100644
--- a/src/finit.c
+++ b/src/finit.c
@@ -298,19 +298,6 @@ int main(int argc, char *argv[])
 	 */
 	conf_parse_cmdline(argc, argv);
 
-	/*
-	 * Hide command line arguments from ps (in particular for
-	 * forked children that don't execv()).  This is an ugly
-	 * hack that only works on Linux.
-	 * https://web.archive.org/web/20110227041321/http://netsplit.com/2007/01/10/hiding-arguments-from-ps/
-	 */
-	if (argc > 1) {
-		char *arg_end;
-
-		arg_end = argv[argc-1] + strlen (argv[argc-1]);
-		*arg_end = ' ';
-	}
-
 	/*
 	 * Initalize event context.
 	 */