From 0969a49c081aee3c53241e2f53ebc89d14070a39 Mon Sep 17 00:00:00 2001
From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Mon, 6 Apr 2009 13:05:57 +0000
Subject: [PATCH] hush: beautify re_execute_shell more

---
 shell/hush.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/shell/hush.c b/shell/hush.c
index dfbd457a2..3eb03e50b 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -2311,6 +2311,12 @@ static void re_execute_shell(const char *s)
 	char **argv, **pp, **pp2;
 	unsigned cnt;
 
+	sprintf(param_buf, "-$%x:%x:%x" USE_HUSH_LOOPS(":%x")
+			, (unsigned) G.root_pid
+			, (unsigned) G.last_bg_pid
+			, (unsigned) G.last_return_code
+			USE_HUSH_LOOPS(, G.depth_of_loop)
+			);
 	/* 1:hush 2:-$<pid>:<pid>:<exitcode>:<depth> <vars...>
 	 * 3:-c 4:<cmd> <argN...> 5:NULL
 	 */
@@ -2321,12 +2327,6 @@ static void re_execute_shell(const char *s)
 	}
 	G.argv_from_re_execing = pp = xzalloc(sizeof(argv[0]) * cnt);
 	*pp++ = (char *) G.argv0_for_re_execing;
-	sprintf(param_buf, "-$%x:%x:%x" USE_HUSH_LOOPS(":%x")
-			, (unsigned) G.root_pid
-			, (unsigned) G.last_bg_pid
-			, (unsigned) G.last_return_code
-			USE_HUSH_LOOPS(, G.depth_of_loop)
-			);
 	*pp++ = param_buf;
 	for (cur = G.top_var; cur; cur = cur->next) {
 		if (cur->varstr == hush_version_str)
-- 
2.25.1