X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Flibbb.h;h=a827ba612ed3f193a38636afd2b4213e53d360fd;hb=147a3ca1a40df4a97e9a12f18eadb537bea73b9a;hp=2b9fd5fd6c96f6b1952f1110fa5ed75df1f25318;hpb=27f64e1f4eb4354844f6553e37501deffde8373e;p=oweals%2Fbusybox.git diff --git a/include/libbb.h b/include/libbb.h index 2b9fd5fd6..a827ba612 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -39,8 +39,8 @@ #include "config.h" -#include "pwd.h" -#include "grp.h" +#include "pwd_.h" +#include "grp_.h" #ifdef CONFIG_FEATURE_SHADOWPASSWDS #include "shadow_.h" #endif @@ -48,6 +48,10 @@ # include "sha1.h" #endif +/* Compatability with ANSI C */ +#ifndef inline +# define inline +#endif #if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) /* libc5 doesn't define socklen_t */ @@ -70,9 +74,6 @@ char *strtok_r(char *s, const char *delim, char **ptrptr); #define BUF_SIZE 8192 #define EXPAND_ALLOC 1024 -static inline int is_decimal(int ch) { return ((ch >= '0') && (ch <= '9')); } -static inline int is_octal(int ch) { return ((ch >= '0') && (ch <= '7')); } - /* Macros for min/max. */ #ifndef MIN #define MIN(a,b) (((a)<(b))?(a):(b)) @@ -82,8 +83,6 @@ static inline int is_octal(int ch) { return ((ch >= '0') && (ch <= '7')); } #define MAX(a,b) (((a)>(b))?(a):(b)) #endif - - extern void show_usage(void) __attribute__ ((noreturn)); extern void error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2))); extern void error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2))); @@ -122,17 +121,17 @@ extern int parse_mode( const char* s, mode_t* theMode); extern int get_kernel_revision(void); -extern int get_console_fd(char* tty_name); +extern int get_console_fd(void); extern struct mntent *find_mount_point(const char *name, const char *table); extern void write_mtab(char* blockDevice, char* directory, char* filesystemType, long flags, char* string_flags); extern void erase_mtab(const char * name); extern long atoi_w_units (const char *cp); -extern long* find_pid_by_name( char* pidName); +extern long* find_pid_by_name( const char* pidName); extern char *find_real_root_device_name(const char* name); extern char *get_line_from_file(FILE *file); extern void print_file(FILE *file); -extern int copyfd(int fd1, int fd2); +extern int copyfd(int fd1, int fd2, const off_t chunksize); extern int print_file_by_name(char *filename); extern char process_escape_sequence(const char **ptr); extern char *get_last_path_component(char *path); @@ -166,11 +165,11 @@ extern unsigned long parse_number(const char *numstr, * increases target size and is often not needed embedded systems. */ extern long my_getpwnam(const char *name); extern long my_getgrnam(const char *name); -extern void my_getpwuid(char *name, long uid); -extern void my_getgrgid(char *group, long gid); +extern char * my_getpwuid(char *name, long uid); +extern char * my_getgrgid(char *group, long gid); extern long my_getpwnamegid(const char *name); -extern int device_open(char *device, int mode); +extern int device_open(const char *device, int mode); extern int del_loop(const char *device); extern int set_loop(const char *device, const char *file, int offset, int *loopro); @@ -227,13 +226,14 @@ extern long arith (const char *startbuf, int *errcode); int read_package_field(const char *package_buffer, char **field_name, char **field_value); char *fgets_str(FILE *file, const char *terminating_string); -extern int inflate(FILE *in, FILE *out); -extern int unzip(FILE *l_in_file, FILE *l_out_file); -extern void gz_close(int gunzip_pid); -extern FILE *gz_open(FILE *compressed_file, int *pid); +extern int uncompress(int fd_in, int fd_out); +extern int inflate(int in, int out); extern struct hostent *xgethostbyname(const char *name); +extern struct hostent *xgethostbyname2(const char *name, int af); extern int create_icmp_socket(void); +extern int create_icmp6_socket(void); +extern int xconnect(const char *host, const char *port); char *dirname (char *path); @@ -318,10 +318,13 @@ void reset_ino_dev_hashtable(void); extern size_t xstrlen(const char *string); #define strlen(x) xstrlen(x) +void bb_asprintf(char **string_ptr, const char *format, ...) __attribute__ ((format (printf, 2, 3))); + #define FAIL_DELAY 3 extern void change_identity ( const struct passwd *pw ); extern void run_shell ( const char *shell, int loginshell, const char *command, const char **additional_args ); +extern int run_parts(char **args, const unsigned char test_mode); extern int restricted_shell ( const char *shell ); extern void setup_environment ( const char *shell, int loginshell, int changeenv, const struct passwd *pw ); extern int correct_password ( const struct passwd *pw ); @@ -329,4 +332,37 @@ extern char *pw_encrypt(const char *clear, const char *salt); extern struct spwd *pwd_to_spwd(const struct passwd *pw); extern int obscure(const char *old, const char *newval, const struct passwd *pwdp); +extern int xopen(const char *pathname, int flags); +extern ssize_t xread(int fd, void *buf, size_t count); +extern void xread_all(int fd, void *buf, size_t count); +extern unsigned char xread_char(int fd); + +typedef struct { + int pid; + char user[9]; + char state[4]; + unsigned long rss; + int ppid; +#ifdef FEATURE_CPU_USAGE_PERCENTAGE + unsigned pcpu; + unsigned long stime, utime; +#endif + char *cmd; + + /* basename of executable file in call to exec(2), + size from kernel headers */ + char short_cmd[16]; +} procps_status_t; + +extern procps_status_t * procps_scan(int save_user_arg0); +extern unsigned short compare_string_array(const char *string_array[], const char *key); + +extern int my_query_module(const char *name, int which, void **buf, size_t *bufsize, size_t *ret); + +typedef struct llist_s { + char *data; + struct llist_s *link; +} llist_t; +extern llist_t *llist_add_to(llist_t *old_head, char *new_item); + #endif /* __LIBCONFIG_H__ */