aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/applets.src.h1
-rw-r--r--include/libbb.h5
2 files changed, 3 insertions, 3 deletions
diff --git a/include/applets.src.h b/include/applets.src.h
index cb36628b5..b80c4f4e8 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -342,7 +342,6 @@ IF_BB_SYSCTL(APPLET(sysctl, BB_DIR_SBIN, BB_SUID_DROP))
342IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP)) 342IF_SYSLOGD(APPLET(syslogd, BB_DIR_SBIN, BB_SUID_DROP))
343IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac)) 343IF_TAC(APPLET_NOEXEC(tac, tac, BB_DIR_USR_BIN, BB_SUID_DROP, tac))
344IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP)) 344IF_TAIL(APPLET(tail, BB_DIR_USR_BIN, BB_SUID_DROP))
345IF_TASKSET(APPLET(taskset, BB_DIR_USR_BIN, BB_SUID_DROP))
346/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */ 345/* IF_TC(APPLET(tc, BB_DIR_SBIN, BB_SUID_DROP)) */
347IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd)) 346IF_TCPSVD(APPLET_ODDNAME(tcpsvd, tcpudpsvd, BB_DIR_USR_BIN, BB_SUID_DROP, tcpsvd))
348IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP)) 347IF_TEE(APPLET(tee, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/include/libbb.h b/include/libbb.h
index f5ecc025f..21a56d78f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -403,8 +403,8 @@ const char *bb_basename(const char *name) FAST_FUNC;
403char *last_char_is(const char *s, int c) FAST_FUNC; 403char *last_char_is(const char *s, int c) FAST_FUNC;
404const char* endofname(const char *name) FAST_FUNC; 404const char* endofname(const char *name) FAST_FUNC;
405 405
406void ndelay_on(int fd) FAST_FUNC; 406int ndelay_on(int fd) FAST_FUNC;
407void ndelay_off(int fd) FAST_FUNC; 407int ndelay_off(int fd) FAST_FUNC;
408void close_on_exec_on(int fd) FAST_FUNC; 408void close_on_exec_on(int fd) FAST_FUNC;
409void xdup2(int, int) FAST_FUNC; 409void xdup2(int, int) FAST_FUNC;
410void xmove_fd(int, int) FAST_FUNC; 410void xmove_fd(int, int) FAST_FUNC;
@@ -1332,6 +1332,7 @@ int sd_listen_fds(void);
1332#define SETUP_ENV_NO_CHDIR (1 << 4) 1332#define SETUP_ENV_NO_CHDIR (1 << 4)
1333void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC; 1333void setup_environment(const char *shell, int flags, const struct passwd *pw) FAST_FUNC;
1334void nuke_str(char *str) FAST_FUNC; 1334void nuke_str(char *str) FAST_FUNC;
1335int check_password(const struct passwd *pw, const char *plaintext) FAST_FUNC;
1335int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC; 1336int ask_and_check_password_extended(const struct passwd *pw, int timeout, const char *prompt) FAST_FUNC;
1336int ask_and_check_password(const struct passwd *pw) FAST_FUNC; 1337int ask_and_check_password(const struct passwd *pw) FAST_FUNC;
1337/* Returns a malloced string */ 1338/* Returns a malloced string */