diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 01:35:07 +0400 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-04-10 01:35:07 +0400 |
| commit | 3f3aa2a57dc648ade9083f3b3ad83cce8206b912 (patch) | |
| tree | d5c648f583bb2edef25f05c2bed303df3d1a61f6 /include | |
| parent | cd7001f7055c3fc2d6298ab9e3befe91e951c652 (diff) | |
make xfunctions optionally longjump instead of exit.
use it for making NOFORK more practical.
touch: make it a NOFORK applet
Diffstat (limited to 'include')
| -rw-r--r-- | include/applets.h | 2 | ||||
| -rw-r--r-- | include/libbb.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/applets.h b/include/applets.h index 013903851..ecce32169 100644 --- a/include/applets.h +++ b/include/applets.h @@ -319,7 +319,7 @@ USE_TFTP(APPLET(tftp, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) #endif USE_TIME(APPLET(time, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TOP(APPLET(top, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) -USE_TOUCH(APPLET_NOEXEC(touch, touch, _BB_DIR_BIN, _BB_SUID_NEVER, touch)) +USE_TOUCH(APPLET_NOFORK(touch, touch, _BB_DIR_BIN, _BB_SUID_NEVER, touch)) USE_TR(APPLET(tr, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_TRACEROUTE(APPLET(traceroute, _BB_DIR_USR_BIN, _BB_SUID_MAYBE)) USE_TRUE(APPLET(true, _BB_DIR_BIN, _BB_SUID_NEVER)) diff --git a/include/libbb.h b/include/libbb.h index cec31a7f4..8e3f4023c 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -620,6 +620,7 @@ extern const char *msg_eol; extern smallint logmode; extern int die_sleep; extern int xfunc_error_retval; +extern jmp_buf die_jmp; extern void sleep_and_die(void) ATTRIBUTE_NORETURN; extern void bb_show_usage(void) ATTRIBUTE_NORETURN ATTRIBUTE_EXTERNALLY_VISIBLE; extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); |