projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vi: rearrange functions, no logic changes
[oweals/busybox.git]
/
shell
/
cttyhack.c
diff --git
a/shell/cttyhack.c
b/shell/cttyhack.c
index 9004b47636aa5a1e37d54deb2e12e5c892f20c66..b9ee59bd0c024f7fb7b42dc3c78b092cc51604ba 100644
(file)
--- a/
shell/cttyhack.c
+++ b/
shell/cttyhack.c
@@
-4,14
+4,8
@@
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
*
* Licensed under GPLv2, see file LICENSE in this source tree.
*/
-#include "libbb.h"
-
-//applet:IF_CTTYHACK(APPLET(cttyhack, BB_DIR_BIN, BB_SUID_DROP))
-
-//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
-
//config:config CTTYHACK
//config:config CTTYHACK
-//config: bool "cttyhack (2.
5
kb)"
+//config: bool "cttyhack (2.
4
kb)"
//config: default y
//config: help
//config: One common problem reported on the mailing list is the "can't
//config: default y
//config: help
//config: One common problem reported on the mailing list is the "can't
@@
-54,6
+48,10
@@
//config:
//config: # getty 115200 $(cttyhack)
//config:
//config: # getty 115200 $(cttyhack)
+//applet:IF_CTTYHACK(APPLET_NOEXEC(cttyhack, cttyhack, BB_DIR_BIN, BB_SUID_DROP, cttyhack))
+
+//kbuild:lib-$(CONFIG_CTTYHACK) += cttyhack.o
+
//usage:#define cttyhack_trivial_usage
//usage: "[PROG ARGS]"
//usage:#define cttyhack_full_usage "\n\n"
//usage:#define cttyhack_trivial_usage
//usage: "[PROG ARGS]"
//usage:#define cttyhack_full_usage "\n\n"
@@
-65,6
+63,8
@@
//usage: "\nStarting interactive shell from boot shell script:"
//usage: "\n setsid cttyhack sh"
//usage: "\nStarting interactive shell from boot shell script:"
//usage: "\n setsid cttyhack sh"
+#include "libbb.h"
+
#if !defined(__linux__) && !defined(TIOCGSERIAL) && !ENABLE_WERROR
# warning cttyhack will not be able to detect a controlling tty on this system
#endif
#if !defined(__linux__) && !defined(TIOCGSERIAL) && !ENABLE_WERROR
# warning cttyhack will not be able to detect a controlling tty on this system
#endif