summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLadislav Michl2010-06-27 03:23:31 +0200
committerDenys Vlasenko2010-06-27 03:23:31 +0200
commita73b87e9343df2a6f14e328a977e7b70eb3ed707 (patch)
tree564869bde93c870b20f6d4d8a3da71e42b629f2e /include
parent1b14cdb27ca5e8104a824424731be430c8592dd6 (diff)
downloadbusybox-a73b87e9343df2a6f14e328a977e7b70eb3ed707.zip
busybox-a73b87e9343df2a6f14e328a977e7b70eb3ed707.tar.gz
*: s/"/bin/sh"/DEFAULT_SHELL, run_shell() API fix, remove unneeded strdup
function old new delta run_shell 157 166 +9 su_main 477 470 -7 sulogin_main 515 503 -12 Signed-off-by: Ladislav Michl <Ladislav.Michl@seznam.cz> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 58719a8..53b768d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1157,7 +1157,6 @@ char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC;
extern void bb_do_delay(int seconds) FAST_FUNC;
extern void change_identity(const struct passwd *pw) FAST_FUNC;
extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) NORETURN FAST_FUNC;
-extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args) FAST_FUNC;
#if ENABLE_SELINUX
extern void renew_current_security_context(void) FAST_FUNC;
extern void set_current_security_context(security_context_t sid) FAST_FUNC;
@@ -1593,12 +1592,12 @@ extern struct globals *const ptr_to_globals;
* use bb_default_login_shell and following defines.
* If you change LIBBB_DEFAULT_LOGIN_SHELL,
* don't forget to change increment constant. */
-#define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh"
+#define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh"
extern const char bb_default_login_shell[];
/* "/bin/sh" */
-#define DEFAULT_SHELL (bb_default_login_shell+1)
+#define DEFAULT_SHELL (bb_default_login_shell+1)
/* "sh" */
-#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
+#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
#if ENABLE_FEATURE_DEVFS
# define CURRENT_VC "/dev/vc/0"