summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2019-03-30 07:47:12 +0000
committerDenys Vlasenko <vda.linux@googlemail.com>2019-03-30 16:46:27 +0100
commit3193cb56d60e73db8bbadf46947a229b321d6c79 (patch)
tree3b7c9b0efc0ac30a0da35ed7bccebff59888d5ca
parenteabf4b2b5786c1d196cb36711d5a4fb38e980940 (diff)
libbb: mark scripted_main() as externally visible
Building with individual binaries enabled fails when embedded script applets are included: /tmp/ccIvMFZg.o: In function `main': applet.c:(.text.main+0x20): undefined reference to `scripted_main' Mark scripted_main() as externally visible. Reported-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--include/libbb.h2
-rw-r--r--libbb/appletlib.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index e0d5521e4..a20d5e403 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1347,7 +1347,7 @@ void bb_logenv_override(void) FAST_FUNC;
/* Embedded script support */
char *get_script_content(unsigned n) FAST_FUNC;
-int scripted_main(int argc, char** argv);
+int scripted_main(int argc, char** argv) MAIN_EXTERNALLY_VISIBLE;
/* Applets which are useful from another applets */
int bb_cat(char** argv) FAST_FUNC;
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index c15014a34..fa19e8488 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -770,6 +770,7 @@ static int find_script_by_name(const char *name)
return -1;
}
+int scripted_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
int scripted_main(int argc UNUSED_PARAM, char **argv)
{
int script = find_script_by_name(applet_name);