svn commit: [25990] trunk/busybox/shell

[vda at busybox.net]

Author: vda
Date: 2009-04-06 13:05:57 +0000 (Mon, 06 Apr 2009)
New Revision: 25990

Log:
hush: beautify re_execute_shell more



Modified:
   trunk/busybox/shell/hush.c


Changeset:
Modified: trunk/busybox/shell/hush.c
===================================================================
--- trunk/busybox/shell/hush.c	2009-04-06 12:56:28 UTC (rev 25989)
+++ trunk/busybox/shell/hush.c	2009-04-06 13:05:57 UTC (rev 25990)
@@ -2311,6 +2311,12 @@
 	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 @@
 	}
 	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)