From 71eb987ff356b97949565cf00abea1077c00fdda Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Sun, 29 Nov 2015 18:55:00 +0000
Subject: [PATCH] rumpbake_main<n> -> rumprun_main<n>

Avoids the problematic term "rumpbake", and the
function name is more a property of rumprun anyway.
---
 app-tools/rumprun-bake.in     |  2 +-
 lib/librumprun_base/main.c    | 23 +++++++++++------------
 lib/librumprun_base/rumprun.c | 16 ++++++++--------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app-tools/rumprun-bake.in b/app-tools/rumprun-bake.in
index f149f8d..129e86e 100644
--- a/app-tools/rumprun-bake.in
+++ b/app-tools/rumprun-bake.in
@@ -378,7 +378,7 @@ for f in "$@"; do
 	_getbininfo ${f}
 
 	${runcmd} ${RUMPBAKE_TOOLDIR}/bin/${RUMPBAKE_TUPLE}-objcopy	\
-	    --redefine-sym main=rumpbake_main${objnum}			\
+	    --redefine-sym main=rumprun_main${objnum}			\
 	    ${f} ${TMPDIR}/tmp${objnum}.obj
 	allobjs="${allobjs} ${TMPDIR}/tmp${objnum}.obj"
 	objnum=$((${objnum}+1))
diff --git a/lib/librumprun_base/main.c b/lib/librumprun_base/main.c
index 70574f8..10c56ce 100644
--- a/lib/librumprun_base/main.c
+++ b/lib/librumprun_base/main.c
@@ -31,23 +31,22 @@
 
 /*
  * for baking multiple executables into a single binary
- * XXX: should not depend on explicit symbol names with hardcoded
- * limits
+ * TODO: remove hardcoded limit
  */
 mainlike_fn rumprun_notmain;
-mainlike_fn rumpbake_main1;
-mainlike_fn rumpbake_main2;
-mainlike_fn rumpbake_main3;
-mainlike_fn rumpbake_main4;
-mainlike_fn rumpbake_main5;
-mainlike_fn rumpbake_main6;
-mainlike_fn rumpbake_main7;
-mainlike_fn rumpbake_main8;
+mainlike_fn rumprun_main1;
+mainlike_fn rumprun_main2;
+mainlike_fn rumprun_main3;
+mainlike_fn rumprun_main4;
+mainlike_fn rumprun_main5;
+mainlike_fn rumprun_main6;
+mainlike_fn rumprun_main7;
+mainlike_fn rumprun_main8;
 
 #define RUNMAIN(i)							\
-	if (rumpbake_main##i == rumprun_notmain)			\
+	if (rumprun_main##i == rumprun_notmain)				\
 		break;							\
-	rumprun(rre->rre_flags, rumpbake_main##i,			\
+	rumprun(rre->rre_flags, rumprun_main##i,			\
 	    rre->rre_argc, rre->rre_argv);				\
 	if ((rre->rre_flags & RUMPRUN_EXEC_CMDLINE) == 0)		\
 		rre = TAILQ_NEXT(rre, rre_entries);			\
diff --git a/lib/librumprun_base/rumprun.c b/lib/librumprun_base/rumprun.c
index 1cdce3d..dca78e7 100644
--- a/lib/librumprun_base/rumprun.c
+++ b/lib/librumprun_base/rumprun.c
@@ -63,14 +63,14 @@ rumprun_enosys(void)
 	return ENOSYS;
 }
 __strong_alias(rumprun_notmain,rumprun_enosys);
-__weak_alias(rumpbake_main1,rumprun_notmain);
-__weak_alias(rumpbake_main2,rumprun_notmain);
-__weak_alias(rumpbake_main3,rumprun_notmain);
-__weak_alias(rumpbake_main4,rumprun_notmain);
-__weak_alias(rumpbake_main5,rumprun_notmain);
-__weak_alias(rumpbake_main6,rumprun_notmain);
-__weak_alias(rumpbake_main7,rumprun_notmain);
-__weak_alias(rumpbake_main8,rumprun_notmain);
+__weak_alias(rumprun_main1,rumprun_notmain);
+__weak_alias(rumprun_main2,rumprun_notmain);
+__weak_alias(rumprun_main3,rumprun_notmain);
+__weak_alias(rumprun_main4,rumprun_notmain);
+__weak_alias(rumprun_main5,rumprun_notmain);
+__weak_alias(rumprun_main6,rumprun_notmain);
+__weak_alias(rumprun_main7,rumprun_notmain);
+__weak_alias(rumprun_main8,rumprun_notmain);
 
 __weak_alias(rump_init_server,rumprun_enosys);
 
-- 
2.39.5