From 3778898f97a64e7b42b53194af7f3b93cc9c07a3 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Sat, 17 Nov 2018 17:48:14 +0000 Subject: Treat custom and applet scripts as applets BusyBox has support for embedded shell scripts. Two types can be distinguished: custom scripts and scripts implementing applets. Custom scripts should be placed in the 'embed' directory at build time. They are given a default applet configuration and appear as applets to the user but no further configuration is possible. Applet scripts are integrated with the BusyBox build system and are intended to be used to ship standard applets that just happen to be implemented as scripts. They can be configured at build time and appear just like native applets. Such scripts should be placed in the 'applets_sh' directory. A stub C program should be written to provide the usual applet configuration details and placed in a suitable subsystem directory. It may be helpful to have a configuration option to enable any dependencies the script requires: see the 'nologin' applet for an example. function old new delta scripted_main - 41 +41 applet_names 2773 2781 +8 applet_main 1600 1604 +4 i2cdetect_main 672 674 +2 applet_suid 100 101 +1 applet_install_loc 200 201 +1 applet_flags 100 101 +1 packed_usage 33180 33179 -1 tryexec 159 152 -7 evalcommand 1661 1653 -8 script_names 9 - -9 packed_scripts 123 114 -9 complete_cmd_dir_file 826 811 -15 shellexec 271 254 -17 find_command 1007 990 -17 busybox_main 642 624 -18 run_applet_and_exit 100 78 -22 find_script_by_name 51 - -51 ------------------------------------------------------------------------------ (add/remove: 1/2 grow/shrink: 6/9 up/down: 58/-174) Total: -116 bytes text data bss dec hex filename 950034 477 7296 957807 e9d6f busybox_old 949918 477 7296 957691 e9cfb busybox_unstripped Signed-off-by: Ron Yorston Signed-off-by: Denys Vlasenko --- applets_sh/README | 5 ----- applets_sh/dos2unix | 5 ----- applets_sh/nologin | 3 +++ applets_sh/tac | 7 ------- applets_sh/unix2dos | 5 ----- 5 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 applets_sh/README delete mode 100755 applets_sh/dos2unix create mode 100755 applets_sh/nologin delete mode 100755 applets_sh/tac delete mode 100755 applets_sh/unix2dos (limited to 'applets_sh') diff --git a/applets_sh/README b/applets_sh/README deleted file mode 100644 index 9dcd38ae3..000000000 --- a/applets_sh/README +++ /dev/null @@ -1,5 +0,0 @@ -This directory contains examples of applets implemented as shell scripts. - -So far these scripts are not hooked to the build system and are not -installed by "make install". If you want to use them, -you need to install them by hand. diff --git a/applets_sh/dos2unix b/applets_sh/dos2unix deleted file mode 100755 index 0fd5206f6..000000000 --- a/applets_sh/dos2unix +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# TODO: use getopt to avoid parsing options as filenames, -# and to support -- and --help -[ $# -ne 0 ] && DASH_I=-i -sed $DASH_I -e 's/\r$//' "$@" diff --git a/applets_sh/nologin b/applets_sh/nologin new file mode 100755 index 000000000..4ed5f6ca3 --- /dev/null +++ b/applets_sh/nologin @@ -0,0 +1,3 @@ +cat /etc/nologin.txt 2>/dev/null || echo This account is not available +sleep 5 +exit 1 diff --git a/applets_sh/tac b/applets_sh/tac deleted file mode 100755 index c5a8e39c1..000000000 --- a/applets_sh/tac +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -# TODO: use getopt to avoid parsing options as filenames, -# and to support -- and --help -for i in "$@" -do -sed -e '1!G;h;$!d' "$i" -done diff --git a/applets_sh/unix2dos b/applets_sh/unix2dos deleted file mode 100755 index 70e042906..000000000 --- a/applets_sh/unix2dos +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh -# TODO: use getopt to avoid parsing options as filenames, -# and to support -- and --help -[ $# -ne 0 ] && DASH_I=-i -sed $DASH_I -e 's/$/\r/' "$@" -- cgit v1.2.3