X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flibbb.h;h=fb7296f25fe0f79489cbb4853274cc59122f8318;hb=f125b6d341b06fda5412b82d23e486100e107eaa;hp=80311db2b2dbb671791bf18caa7a14834f1b6f12;hpb=d7a805efafd83203e72c334089c3f88204231ac7;p=oweals%2Fbusybox.git diff --git a/include/libbb.h b/include/libbb.h index 80311db2b..fb7296f25 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -7,8 +7,8 @@ * * Licensed under the GPL version 2, see the file LICENSE in this tarball. */ -#ifndef __LIBBUSYBOX_H__ -#define __LIBBUSYBOX_H__ 1 +#ifndef LIBBB_H +#define LIBBB_H 1 #include "platform.h" @@ -29,6 +29,10 @@ #include #include #include +#if defined __FreeBSD__ +#include +#include +#endif #include #include #include @@ -72,7 +76,12 @@ #include #include #if ENABLE_FEATURE_SHADOWPASSWDS -# include +# if !ENABLE_USE_BB_SHADOW +/* If using busybox's shadow implementation, do not include the shadow.h + * header as the toolchain may not provide it at all. + */ +# include +# endif #endif /* Some libc's forget to declare these, do it ourself */ @@ -86,7 +95,9 @@ int klogctl(int type, char *b, int len); /* This is declared here rather than #including in order to avoid * confusing the two versions of basename. See the dirname/basename man page * for details. */ +#if !defined __FreeBSD__ char *dirname(char *path); +#endif /* Include our own copy of struct sysinfo to avoid binary compatibility * problems with Linux 2.4, which changed things. Grumble, grumble. */ struct sysinfo { @@ -110,9 +121,7 @@ int sysinfo(struct sysinfo* info); /* Make all declarations hidden (-fvisibility flag only affects definitions) */ /* (don't include system headers after this until corresponding pop!) */ -#if __GNUC_PREREQ(4,1) -# pragma GCC visibility push(hidden) -#endif +PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN #if ENABLE_USE_BB_PWD_GRP @@ -150,6 +159,7 @@ int sysinfo(struct sysinfo* info); /* CONFIG_LFS is on */ # if ULONG_MAX > 0xffffffff /* "long" is long enough on this system */ +typedef unsigned long uoff_t; # define XATOOFF(a) xatoul_range(a, 0, LONG_MAX) /* usage: sz = BB_STRTOOFF(s, NULL, 10); if (errno || sz < 0) die(); */ # define BB_STRTOOFF bb_strtoul @@ -158,6 +168,7 @@ int sysinfo(struct sysinfo* info); # define OFF_FMT "l" # else /* "long" is too short, need "long long" */ +typedef unsigned long long uoff_t; # define XATOOFF(a) xatoull_range(a, 0, LLONG_MAX) # define BB_STRTOOFF bb_strtoull # define STRTOOFF strtoull @@ -168,11 +179,13 @@ int sysinfo(struct sysinfo* info); # if UINT_MAX == 0xffffffff /* While sizeof(off_t) == sizeof(int), off_t is typedef'ed to long anyway. * gcc will throw warnings on printf("%d", off_t). Crap... */ +typedef unsigned long uoff_t; # define XATOOFF(a) xatoi_u(a) # define BB_STRTOOFF bb_strtou # define STRTOOFF strtol # define OFF_FMT "l" # else +typedef unsigned long uoff_t; # define XATOOFF(a) xatoul_range(a, 0, LONG_MAX) # define BB_STRTOOFF bb_strtoul # define STRTOOFF strtol @@ -258,7 +271,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c, mv.c, install.c depend on them. */ FILEUTILS_SET_SECURITY_CONTEXT = 0x200 #endif }; -#define FILEUTILS_CP_OPTSTR "pdRfilsL" USE_SELINUX("c") +#define FILEUTILS_CP_OPTSTR "pdRfilsL" IF_SELINUX("c") extern int remove_file(const char *path, int flags) FAST_FUNC; /* NB: without FILEUTILS_RECUR in flags, it will basically "cat" * the source, not copy (unless "source" is a directory). @@ -273,7 +286,9 @@ enum { ACTION_DEPTHFIRST = (1 << 3), /*ACTION_REVERSE = (1 << 4), - unused */ ACTION_QUIET = (1 << 5), + ACTION_DANGLING_OK = (1 << 6), }; +typedef uint8_t recurse_flags_t; extern int recursive_action(const char *fileName, unsigned flags, int FAST_FUNC (*fileAction)(const char *fileName, struct stat* statbuf, void* userData, int depth), int FAST_FUNC (*dirAction)(const char *fileName, struct stat* statbuf, void* userData, int depth), @@ -353,8 +368,8 @@ enum { void bb_signals(int sigs, void (*f)(int)) FAST_FUNC; /* Unlike signal() and bb_signals, sets handler with sigaction() * and in a way that while signal handler is run, no other signals - * will be blocked: */ -void bb_signals_recursive(int sigs, void (*f)(int)) FAST_FUNC; + * will be blocked; syscalls will not be restarted: */ +void bb_signals_recursive_norestart(int sigs, void (*f)(int)) FAST_FUNC; /* syscalls like read() will be interrupted with EINTR: */ void signal_no_SA_RESTART_empty_mask(int sig, void (*handler)(int)) FAST_FUNC; /* syscalls like read() won't be interrupted (though select/poll will be): */ @@ -377,9 +392,10 @@ void xsetuid(uid_t uid) FAST_FUNC; void xchdir(const char *path) FAST_FUNC; void xchroot(const char *path) FAST_FUNC; void xsetenv(const char *key, const char *value) FAST_FUNC; +void bb_unsetenv(const char *key) FAST_FUNC; void xunlink(const char *pathname) FAST_FUNC; void xstat(const char *pathname, struct stat *buf) FAST_FUNC; -int xopen(const char *pathname, int flags) FAST_FUNC FAST_FUNC; +int xopen(const char *pathname, int flags) FAST_FUNC; int xopen3(const char *pathname, int flags, int mode) FAST_FUNC; int open_or_warn(const char *pathname, int flags) FAST_FUNC; int open3_or_warn(const char *pathname, int flags, int mode) FAST_FUNC; @@ -423,6 +439,10 @@ struct BUG_too_small { }; +void parse_datestr(const char *date_str, struct tm *tm_time) FAST_FUNC; +time_t validate_tm_time(const char *date_str, struct tm *tm_time) FAST_FUNC; + + int xsocket(int domain, int type, int protocol) FAST_FUNC; void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC; void xlisten(int s, int backlog) FAST_FUNC; @@ -437,6 +457,7 @@ ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to, * Turn it on before you call bind(). */ void setsockopt_reuseaddr(int fd) FAST_FUNC; /* On Linux this never fails. */ int setsockopt_broadcast(int fd) FAST_FUNC; +int setsockopt_bindtodevice(int fd, const char *iface) FAST_FUNC; /* NB: returns port in host byte order */ unsigned bb_lookup_port(const char *port, const char *protocol, unsigned default_port) FAST_FUNC; typedef struct len_and_sockaddr { @@ -487,6 +508,8 @@ int create_and_bind_dgram_or_die(const char *bindaddr, int port) FAST_FUNC; int create_and_connect_stream_or_die(const char *peer, int port) FAST_FUNC; /* Connect to peer identified by lsa */ int xconnect_stream(const len_and_sockaddr *lsa) FAST_FUNC; +/* Get local address of bound or accepted socket */ +len_and_sockaddr *get_sock_lsa(int fd) FAST_FUNC; /* Return malloc'ed len_and_sockaddr with socket address of host:port * Currently will return IPv4 or IPv6 sockaddrs only * (depending on host), but in theory nothing prevents e.g. @@ -590,9 +613,9 @@ extern ssize_t open_read_close(const char *filename, void *buf, size_t maxsz) FA // Reads byte-by-byte. Useful when it is important to not read ahead. // Bytes are appended to pfx (which must be malloced, or NULL). extern char *xmalloc_reads(int fd, char *pfx, size_t *maxsz_p) FAST_FUNC; -/* Reads block up to *maxsz_p (default: MAX_INT(ssize_t)) */ +/* Reads block up to *maxsz_p (default: INT_MAX - 4095) */ extern void *xmalloc_read(int fd, size_t *maxsz_p) FAST_FUNC; -/* Returns NULL if file can't be opened */ +/* Returns NULL if file can't be opened (default max size: INT_MAX - 4095) */ extern void *xmalloc_open_read_close(const char *filename, size_t *maxsz_p) FAST_FUNC; /* Autodetects .gz etc */ extern int open_zipped(const char *fname) FAST_FUNC; @@ -605,8 +628,12 @@ extern ssize_t safe_write(int fd, const void *buf, size_t count) FAST_FUNC; // if some data was written before error occurred extern ssize_t full_write(int fd, const void *buf, size_t count) FAST_FUNC; extern void xwrite(int fd, const void *buf, size_t count) FAST_FUNC; +extern void xwrite_str(int fd, const char *str) FAST_FUNC; extern void xopen_xwrite_close(const char* file, const char *str) FAST_FUNC; +/* Close fd, but check for failures (some types of write errors) */ +extern void xclose(int fd) FAST_FUNC; + /* Reads and prints to stdout till eof, then closes FILE. Exits on error: */ extern void xprint_and_close_file(FILE *file) FAST_FUNC; @@ -614,6 +641,8 @@ extern char *bb_get_chunk_from_file(FILE *file, int *end) FAST_FUNC; extern char *bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno) FAST_FUNC; /* Reads up to (and including) TERMINATING_STRING: */ extern char *xmalloc_fgets_str(FILE *file, const char *terminating_string) FAST_FUNC; +/* Same, with limited max size, and returns the length (excluding NUL): */ +extern char *xmalloc_fgets_str_len(FILE *file, const char *terminating_string, size_t *maxsz_p) FAST_FUNC; /* Chops off TERMINATING_STRING from the end: */ extern char *xmalloc_fgetline_str(FILE *file, const char *terminating_string) FAST_FUNC; /* Reads up to (and including) "\n" or NUL byte: */ @@ -662,12 +691,19 @@ char *itoa_to_buf(int n, char *buf, unsigned buflen) FAST_FUNC; /* Intelligent formatters of bignums */ void smart_ulltoa4(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC; void smart_ulltoa5(unsigned long long ul, char buf[5], const char *scale) FAST_FUNC; +/* If block_size == 0, display size without fractional part, + * else display (size * block_size) with one decimal digit. + * If display_unit == 0, add suffix (K,M,G...), + * else divide by display_unit and do not use suffix. */ //TODO: provide pointer to buf (avoid statics)? const char *make_human_readable_str(unsigned long long size, unsigned long block_size, unsigned long display_unit) FAST_FUNC; /* Put a string of hex bytes ("1b2e66fe"...), return advanced pointer */ char *bin2hex(char *buf, const char *cp, int count) FAST_FUNC; +/* Generate a UUID */ +void generate_uuid(uint8_t *buf) FAST_FUNC; + /* Last element is marked by mult == 0 */ struct suffix_mult { char suffix[4]; @@ -703,6 +739,7 @@ void xget_uidgid(struct bb_uidgid_t*, const char*) FAST_FUNC; /* chown-like handling of "user[:[group]" */ void parse_chown_usergroup_or_die(struct bb_uidgid_t *u, char *user_group) FAST_FUNC; struct passwd* xgetpwnam(const char *name) FAST_FUNC; +struct group* xgetgrnam(const char *name) FAST_FUNC; struct passwd* xgetpwuid(uid_t uid) FAST_FUNC; struct group* xgetgrgid(gid_t gid) FAST_FUNC; char* xuid2uname(uid_t uid) FAST_FUNC; @@ -755,12 +792,8 @@ pid_t safe_waitpid(pid_t pid, int *wstat, int options) FAST_FUNC; */ int wait4pid(pid_t pid) FAST_FUNC; pid_t wait_any_nohang(int *wstat) FAST_FUNC; -#define wait_crashed(w) ((w) & 127) -#define wait_exitcode(w) ((w) >> 8) -#define wait_stopsig(w) ((w) >> 8) -#define wait_stopped(w) (((w) & 127) == 127) /* wait4pid(spawn(argv)) + NOFORK/NOEXEC (if configured) */ -pid_t spawn_and_wait(char **argv) FAST_FUNC; +int spawn_and_wait(char **argv) FAST_FUNC; struct nofork_save_area { jmp_buf die_jmp; const char *applet_name; @@ -789,9 +822,9 @@ int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char ** * Both of the above will redirect fd 0,1,2 to /dev/null and drop ctty * (will do setsid()). * - * forkexit_or_rexec(argv) = bare-bones "fork + parent exits" on MMU, + * fork_or_rexec(argv) = bare-bones "fork" on MMU, * "vfork + re-exec ourself" on NOMMU. No fd redirection, no setsid(). - * Currently used for setsid only. On MMU ignores argv. + * On MMU ignores argv. * * Helper for network daemons in foreground mode: * @@ -805,14 +838,14 @@ enum { DAEMON_ONLY_SANITIZE = 8, /* internal use */ }; #if BB_MMU - void forkexit_or_rexec(void) FAST_FUNC; + pid_t fork_or_rexec(void) FAST_FUNC; enum { re_execed = 0 }; -# define forkexit_or_rexec(argv) forkexit_or_rexec() +# define fork_or_rexec(argv) fork_or_rexec() # define bb_daemonize_or_rexec(flags, argv) bb_daemonize_or_rexec(flags) # define bb_daemonize(flags) bb_daemonize_or_rexec(flags, bogus) #else void re_exec(char **argv) NORETURN FAST_FUNC; - void forkexit_or_rexec(char **argv) FAST_FUNC; + pid_t fork_or_rexec(char **argv) FAST_FUNC; extern bool re_execed; int BUG_fork_is_unavailable_on_nommu(void) FAST_FUNC; int BUG_daemon_is_unavailable_on_nommu(void) FAST_FUNC; @@ -829,7 +862,7 @@ int sanitize_env_if_suid(void) FAST_FUNC; extern const char *const bb_argv_dash[]; /* "-", NULL */ extern const char *opt_complementary; -#if ENABLE_GETOPT_LONG +#if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG #define No_argument "\0" #define Required_argument "\001" #define Optional_argument "\002" @@ -849,6 +882,7 @@ void *llist_pop(llist_t **elm) FAST_FUNC; void llist_unlink(llist_t **head, llist_t *elm) FAST_FUNC; void llist_free(llist_t *elm, void (*freeit)(void *data)) FAST_FUNC; llist_t *llist_rev(llist_t *list) FAST_FUNC; +llist_t *llist_find_str(llist_t *first, const char *str) FAST_FUNC; /* BTW, surprisingly, changing API to * llist_t *llist_add_to(llist_t *old_head, void *data) * etc does not result in smaller code... */ @@ -884,7 +918,7 @@ extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, f extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC; extern void bb_simple_perror_msg(const char *s) FAST_FUNC; extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC; -extern void bb_simple_perror_msg_and_die(const char *s) __attribute__ ((noreturn)) FAST_FUNC; +extern void bb_simple_perror_msg_and_die(const char *s) NORETURN FAST_FUNC; extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))) FAST_FUNC; extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))) FAST_FUNC; extern void bb_perror_nomsg_and_die(void) NORETURN FAST_FUNC; @@ -905,13 +939,15 @@ extern void bb_verror_msg(const char *s, va_list p, const char *strerr) FAST_FUN /* Applets which are useful from another applets */ int bb_cat(char** argv); /* If shell needs them, they exist even if not enabled as applets */ -int echo_main(int argc, char** argv) USE_ECHO(MAIN_EXTERNALLY_VISIBLE); -int printf_main(int argc, char **argv) USE_PRINTF(MAIN_EXTERNALLY_VISIBLE); -int test_main(int argc, char **argv) USE_TEST(MAIN_EXTERNALLY_VISIBLE); -int kill_main(int argc, char **argv) USE_KILL(MAIN_EXTERNALLY_VISIBLE); +int echo_main(int argc, char** argv) IF_ECHO(MAIN_EXTERNALLY_VISIBLE); +int printf_main(int argc, char **argv) IF_PRINTF(MAIN_EXTERNALLY_VISIBLE); +int test_main(int argc, char **argv) IF_TEST(MAIN_EXTERNALLY_VISIBLE); +int kill_main(int argc, char **argv) IF_KILL(MAIN_EXTERNALLY_VISIBLE); /* Similar, but used by chgrp, not shell */ -int chown_main(int argc, char **argv) USE_CHOWN(MAIN_EXTERNALLY_VISIBLE); -/* Don't need USE_xxx() guard for these */ +int chown_main(int argc, char **argv) IF_CHOWN(MAIN_EXTERNALLY_VISIBLE); +/* Used by ftpd */ +int ls_main(int argc, char **argv) IF_LS(MAIN_EXTERNALLY_VISIBLE); +/* Don't need IF_xxx() guard for these */ int gunzip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int bunzip2_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; @@ -920,41 +956,6 @@ void bb_displayroutes(int noresolve, int netstatfmt) FAST_FUNC; #endif -/* "Keycodes" that report an escape sequence. - * We use something which fits into signed char, - * yet doesn't represent any valid Unicode characher. - * Also, -1 is reserved for error indication and we don't use it. */ -enum { - KEYCODE_UP = -2, - KEYCODE_DOWN = -3, - KEYCODE_RIGHT = -4, - KEYCODE_LEFT = -5, - KEYCODE_HOME = -6, - KEYCODE_END = -7, - KEYCODE_INSERT = -8, - KEYCODE_DELETE = -9, - KEYCODE_PAGEUP = -10, - KEYCODE_PAGEDOWN = -11, -#if 0 - KEYCODE_FUN1 = -12, - KEYCODE_FUN2 = -13, - KEYCODE_FUN3 = -14, - KEYCODE_FUN4 = -15, - KEYCODE_FUN5 = -16, - KEYCODE_FUN6 = -17, - KEYCODE_FUN7 = -18, - KEYCODE_FUN8 = -19, - KEYCODE_FUN9 = -20, - KEYCODE_FUN10 = -21, - KEYCODE_FUN11 = -22, - KEYCODE_FUN12 = -23, -#endif - /* How long the longest ESC sequence we know? */ - KEYCODE_BUFFER_SIZE = 4 -}; -int read_key(int fd, smalluint *nbuffered, char *buffer) FAST_FUNC; - - /* Networking */ int create_icmp_socket(void) FAST_FUNC; int create_icmp6_socket(void) FAST_FUNC; @@ -1006,7 +1007,7 @@ extern void run_applet_no_and_exit(int a, char **argv) NORETURN FAST_FUNC; #ifdef HAVE_MNTENT_H extern int match_fstype(const struct mntent *mt, const char *fstypes) FAST_FUNC; -extern struct mntent *find_mount_point(const char *name, const char *table) FAST_FUNC; +extern struct mntent *find_mount_point(const char *name, int subdir_too) FAST_FUNC; #endif extern void erase_mtab(const char * name) FAST_FUNC; extern unsigned int tty_baud_to_value(speed_t speed) FAST_FUNC; @@ -1080,6 +1081,8 @@ const char *get_signame(int number) FAST_FUNC; void print_signames(void) FAST_FUNC; char *bb_simplify_path(const char *path) FAST_FUNC; +/* Returns ptr to NUL */ +char *bb_simplify_abs_path_inplace(char *path) FAST_FUNC; #define FAIL_DELAY 3 extern void bb_do_delay(int seconds) FAST_FUNC; @@ -1129,9 +1132,16 @@ extern int obscure(const char *old, const char *newval, const struct passwd *pwd * (otherwise we risk having same salt generated) */ extern int crypt_make_salt(char *p, int cnt, int rnd) FAST_FUNC; + /* Returns number of lines changed, or -1 on error */ -extern int update_passwd(const char *filename, const char *username, - const char *new_pw) FAST_FUNC; +#if !(ENABLE_FEATURE_ADDUSER_TO_GROUP || ENABLE_FEATURE_DEL_USER_FROM_GROUP) +#define update_passwd(filename, username, data, member) \ + update_passwd(filename, username, data) +#endif +extern int update_passwd(const char *filename, + const char *username, + const char *data, + const char *member) FAST_FUNC; int index_in_str_array(const char *const string_array[], const char *key) FAST_FUNC; int index_in_strings(const char *strings, const char *key) FAST_FUNC; @@ -1142,6 +1152,7 @@ const char *nth_string(const char *strings, int n) FAST_FUNC; extern void print_login_issue(const char *issue_file, const char *tty) FAST_FUNC; extern void print_login_prompt(void) FAST_FUNC; +char *xmalloc_ttyname(int fd) FAST_FUNC; /* NB: typically you want to pass fd 0, not 1. Think 'applet | grep something' */ int get_terminal_width_height(int fd, unsigned *width, unsigned *height) FAST_FUNC; @@ -1173,22 +1184,73 @@ unsigned long long bb_makedev(unsigned int major, unsigned int minor) FAST_FUNC; #endif +/* "Keycodes" that report an escape sequence. + * We use something which fits into signed char, + * yet doesn't represent any valid Unicode character. + * Also, -1 is reserved for error indication and we don't use it. */ +enum { + KEYCODE_UP = -2, + KEYCODE_DOWN = -3, + KEYCODE_RIGHT = -4, + KEYCODE_LEFT = -5, + KEYCODE_HOME = -6, + KEYCODE_END = -7, + KEYCODE_INSERT = -8, + KEYCODE_DELETE = -9, + KEYCODE_PAGEUP = -10, + KEYCODE_PAGEDOWN = -11, +#if 0 + KEYCODE_FUN1 = -12, + KEYCODE_FUN2 = -13, + KEYCODE_FUN3 = -14, + KEYCODE_FUN4 = -15, + KEYCODE_FUN5 = -16, + KEYCODE_FUN6 = -17, + KEYCODE_FUN7 = -18, + KEYCODE_FUN8 = -19, + KEYCODE_FUN9 = -20, + KEYCODE_FUN10 = -21, + KEYCODE_FUN11 = -22, + KEYCODE_FUN12 = -23, +#endif + KEYCODE_CURSOR_POS = -0x100, + /* How long is the longest ESC sequence we know? + * We want it big enough to be able to contain + * cursor position sequence "ESC [ 9999 ; 9999 R" + */ + KEYCODE_BUFFER_SIZE = 16 +}; +/* Note: fd may be in blocking or non-blocking mode, both make sense. + * For one, less uses non-blocking mode. + * Only the first read syscall inside read_key may block indefinitely + * (unless fd is in non-blocking mode), + * subsequent reads will time out after a few milliseconds. + * Return of -1 means EOF or error (errno == 0 on EOF). + * buffer[0] is used as a counter of buffered chars and must be 0 + * on first call. + */ +int64_t read_key(int fd, char *buffer) FAST_FUNC; + + #if ENABLE_FEATURE_EDITING /* It's NOT just ENABLEd or disabled. It's a number: */ -#ifdef CONFIG_FEATURE_EDITING_HISTORY -#define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0) -#else -#define MAX_HISTORY 0 -#endif +# ifdef CONFIG_FEATURE_EDITING_HISTORY +# define MAX_HISTORY (CONFIG_FEATURE_EDITING_HISTORY + 0) +# else +# define MAX_HISTORY 0 +# endif typedef struct line_input_t { int flags; const char *path_lookup; -#if MAX_HISTORY +# if MAX_HISTORY int cnt_history; int cur_history; - USE_FEATURE_EDITING_SAVEHISTORY(const char *hist_file;) +# if ENABLE_FEATURE_EDITING_SAVEHISTORY + unsigned cnt_history_in_file; + const char *hist_file; +# endif char *history[MAX_HISTORY + 1]; -#endif +# endif } line_input_t; enum { DO_HISTORY = 1 * (MAX_HISTORY > 0), @@ -1200,13 +1262,16 @@ enum { FOR_SHELL = DO_HISTORY | SAVE_HISTORY | TAB_COMPLETION | USERNAME_COMPLETION, }; line_input_t *new_line_input_t(int flags) FAST_FUNC; -/* Returns: +/* So far static: void free_line_input_t(line_input_t *n) FAST_FUNC; */ +/* maxsize must be >= 2. + * Returns: * -1 on read errors or EOF, or on bare Ctrl-D, * 0 on ctrl-C (the line entered is still returned in 'command'), * >0 length of input string, including terminating '\n' */ int read_line_input(const char* prompt, char* command, int maxsize, line_input_t *state) FAST_FUNC; #else +#define MAX_HISTORY 0 int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; #define read_line_input(prompt, command, maxsize, state) \ read_line_input(prompt, command, maxsize) @@ -1214,21 +1279,23 @@ int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC; #ifndef COMM_LEN -#ifdef TASK_COMM_LEN +# ifdef TASK_COMM_LEN enum { COMM_LEN = TASK_COMM_LEN }; -#else +# else /* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */ enum { COMM_LEN = 16 }; -#endif +# endif #endif typedef struct procps_status_t { DIR *dir; + IF_FEATURE_SHOW_THREADS(DIR *task_dir;) uint8_t shift_pages_to_bytes; uint8_t shift_pages_to_kb; /* Fields are set to 0/NULL if failed to determine (or not requested) */ uint16_t argv_len; char *argv0; - USE_SELINUX(char *context;) + char *exe; + IF_SELINUX(char *context;) /* Everything below must contain no ptrs to malloc'ed data: * it is memset(0) for each process in procps_scan() */ unsigned long vsz, rss; /* we round it to kbytes */ @@ -1240,6 +1307,11 @@ typedef struct procps_status_t { unsigned sid; unsigned uid; unsigned gid; +#if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS + unsigned ruid; + unsigned rgid; + int niceness; +#endif unsigned tty_major,tty_minor; #if ENABLE_FEATURE_TOPMEM unsigned long mapped_rw; @@ -1260,6 +1332,7 @@ typedef struct procps_status_t { int last_seen_on_cpu; #endif } procps_status_t; +/* flag bits for procps_scan(xx, flags) calls */ enum { PSSCAN_PID = 1 << 0, PSSCAN_PPID = 1 << 1, @@ -1269,7 +1342,7 @@ enum { PSSCAN_COMM = 1 << 5, /* PSSCAN_CMD = 1 << 6, - use read_cmdline instead */ PSSCAN_ARGV0 = 1 << 7, - /* PSSCAN_EXE = 1 << 8, - not implemented */ + PSSCAN_EXE = 1 << 8, PSSCAN_STATE = 1 << 9, PSSCAN_VSZ = 1 << 10, PSSCAN_RSS = 1 << 11, @@ -1277,26 +1350,33 @@ enum { PSSCAN_UTIME = 1 << 13, PSSCAN_TTY = 1 << 14, PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, - PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), - USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) + /* NB: used by find_pid_by_name(). Any applet using it + * needs to be mentioned here. */ + PSSCAN_ARGVN = (1 << 16) * (ENABLE_KILLALL + || ENABLE_PGREP || ENABLE_PKILL + || ENABLE_PIDOF + || ENABLE_SESTATUS + ), + PSSCAN_CONTEXT = (1 << 17) * ENABLE_SELINUX, PSSCAN_START_TIME = 1 << 18, - PSSCAN_CPU = 1 << 19, + PSSCAN_CPU = (1 << 19) * ENABLE_FEATURE_TOP_SMP_PROCESS, + PSSCAN_NICE = (1 << 20) * ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS, + PSSCAN_RUIDGID = (1 << 21) * ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS, + PSSCAN_TASKS = (1 << 22) * ENABLE_FEATURE_SHOW_THREADS, /* These are all retrieved from proc/NN/stat in one go: */ PSSCAN_STAT = PSSCAN_PPID | PSSCAN_PGID | PSSCAN_SID /**/ | PSSCAN_COMM | PSSCAN_STATE /**/ | PSSCAN_VSZ | PSSCAN_RSS /**/ | PSSCAN_STIME | PSSCAN_UTIME | PSSCAN_START_TIME - /**/ | PSSCAN_TTY -#if ENABLE_FEATURE_TOP_SMP_PROCESS + /**/ | PSSCAN_TTY | PSSCAN_NICE /**/ | PSSCAN_CPU -#endif }; //procps_status_t* alloc_procps_scan(void) FAST_FUNC; void free_procps_scan(procps_status_t* sp) FAST_FUNC; procps_status_t* procps_scan(procps_status_t* sp, int flags) FAST_FUNC; -/* Format cmdline (up to col chars) into char buf[col+1] */ +/* Format cmdline (up to col chars) into char buf[size] */ /* Puts [comm] if cmdline is empty (-> process is a kernel thread) */ -void read_cmdline(char *buf, int col, unsigned pid, const char *comm) FAST_FUNC; +void read_cmdline(char *buf, int size, unsigned pid, const char *comm) FAST_FUNC; pid_t *find_pid_by_name(const char* procName) FAST_FUNC; pid_t *pidlist_reverse(pid_t *pidList) FAST_FUNC; @@ -1306,27 +1386,22 @@ extern const char bb_uuenc_tbl_std[]; void bb_uuencode(char *store, const void *s, int length, const char *tbl) FAST_FUNC; typedef struct sha1_ctx_t { - uint32_t count[2]; - uint32_t hash[5]; - uint32_t wbuf[16]; + uint32_t hash[8]; /* 5, +3 elements for sha256 */ + uint64_t total64; + uint8_t wbuffer[64]; /* NB: always correctly aligned for uint64_t */ + void (*process_block)(struct sha1_ctx_t*) FAST_FUNC; } sha1_ctx_t; void sha1_begin(sha1_ctx_t *ctx) FAST_FUNC; void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx) FAST_FUNC; void sha1_end(void *resbuf, sha1_ctx_t *ctx) FAST_FUNC; -typedef struct sha256_ctx_t { - uint32_t H[8]; - uint32_t total[2]; /* rename to "count"? */ - uint32_t buflen; - char buffer[128]; /* NB: always correctly aligned for uint32_t */ -} sha256_ctx_t; +typedef struct sha1_ctx_t sha256_ctx_t; void sha256_begin(sha256_ctx_t *ctx) FAST_FUNC; -void sha256_hash(const void *buffer, size_t len, sha256_ctx_t *ctx) FAST_FUNC; -void sha256_end(void *resbuf, sha256_ctx_t *ctx) FAST_FUNC; +#define sha256_hash sha1_hash +#define sha256_end sha1_end typedef struct sha512_ctx_t { - uint64_t H[8]; - uint64_t total[2]; - uint64_t buflen; - char buffer[256]; /* NB: always correctly aligned for uint64_t */ + uint64_t hash[8]; + uint64_t total64[2]; + uint8_t wbuffer[128]; /* NB: always correctly aligned for uint64_t */ } sha512_ctx_t; void sha512_begin(sha512_ctx_t *ctx) FAST_FUNC; void sha512_hash(const void *buffer, size_t len, sha512_ctx_t *ctx) FAST_FUNC; @@ -1419,7 +1494,7 @@ extern struct globals *const ptr_to_globals; /* At least gcc 3.4.6 on mipsel system needs optimization barrier */ #define barrier() __asm__ __volatile__("":::"memory") #define SET_PTR_TO_GLOBALS(x) do { \ - (*(struct globals**)&ptr_to_globals) = (x); \ + (*(struct globals**)&ptr_to_globals) = (void*)(x); \ barrier(); \ } while (0) @@ -1501,7 +1576,6 @@ extern const char bb_default_login_shell[]; #undef islower #undef isprint #undef ispunct -#undef isspace #undef isupper #undef isxdigit @@ -1509,12 +1583,19 @@ extern const char bb_default_login_shell[]; #undef isdigit #define isdigit(a) ((unsigned)((a) - '0') <= 9) -#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) +/* This one is more efficient too! ~200 bytes */ +/* In POSIX/C locale (the only locale we care about: do we REALLY want + * to allow Unicode whitespace in, say, .conf files? nuts!) + * isspace is only these chars: "\t\n\v\f\r" and space. + * "\t\n\v\f\r" happen to have ASCII codes 9,10,11,12,13. + * Use that. + */ +#undef isspace +#define isspace(a) ({ unsigned char bb__isspace = (a) - 9; bb__isspace == (' ' - 9) || bb__isspace <= (13 - 9); }) +#define ARRAY_SIZE(x) ((unsigned)(sizeof(x) / sizeof((x)[0]))) -#if __GNUC_PREREQ(4,1) -# pragma GCC visibility pop -#endif +POP_SAVED_FUNCTION_VISIBILITY -#endif /* __LIBBUSYBOX_H__ */ +#endif