X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Flibbb.h;h=a9c1a870f7f670896804a8daea100ff451178064;hb=6fc92a506ab3c490a4dc028334c908f19c0d0806;hp=02cf607a7f3f5785e68cd6ea553871515f0628ea;hpb=14d354312a9d49a8b410516c20be57159af217a5;p=oweals%2Fbusybox.git diff --git a/libbb/libbb.h b/libbb/libbb.h index 02cf607a7..a9c1a870f 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -29,6 +29,8 @@ #include #include +#include + #ifdef DMALLOC #include "dmalloc.h" #endif @@ -77,6 +79,9 @@ 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))); extern void perror_msg(const char *s, ...); extern void perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn)); +extern void vherror_msg(const char *s, va_list p); +extern void herror_msg(const char *s, ...); +extern void herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn)); /* These two are used internally -- you shouldn't need to use them */ extern void verror_msg(const char *s, va_list p); @@ -87,16 +92,6 @@ const char *time_string(time_t timeVal); int is_directory(const char *name, int followLinks, struct stat *statBuf); int isDevice(const char *name); -typedef struct ino_dev_hash_bucket_struct { - struct ino_dev_hash_bucket_struct *next; - ino_t ino; - dev_t dev; - char name[1]; -} ino_dev_hashtable_bucket_t; -int is_in_ino_dev_hashtable(const struct stat *statbuf, char **name); -void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name); -void reset_ino_dev_hashtable(void); - int remove_file(const char *path, int flags); int copy_file(const char *source, const char *dest, int flags); int copy_file_chunk(FILE *src_file, FILE *dst_file, unsigned long long chunksize); @@ -113,7 +108,6 @@ int recursive_action(const char *fileName, int recurse, int followLinks, int dep int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData), void* userData); -extern int create_path (const char *name, int mode); extern int parse_mode( const char* s, mode_t* theMode); extern int get_kernel_revision(void); @@ -123,15 +117,12 @@ 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 void mtab_read(void); -extern char *mtab_first(void **iter); -extern char *mtab_next(void **iter); -extern char *mtab_getinfo(const char *match, const char which); extern long atoi_w_units (const char *cp); extern pid_t* find_pid_by_name( char* pidName); -extern int find_real_root_device_name(char* name); +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 print_file_by_name(char *filename); extern char process_escape_sequence(const char **ptr); extern char *get_last_path_component(char *path); @@ -198,6 +189,7 @@ struct sysinfo { unsigned long totalswap; /* Total swap space size */ unsigned long freeswap; /* swap space still available */ unsigned short procs; /* Number of current processes */ + unsigned short pad; /* Padding needed for m68k */ unsigned long totalhigh; /* Total high memory size */ unsigned long freehigh; /* Available high memory size */ unsigned int mem_unit; /* Memory unit size in bytes */ @@ -205,12 +197,12 @@ struct sysinfo { }; extern int sysinfo (struct sysinfo* info); -const char *make_human_readable_str(unsigned long val, unsigned long not_hr); enum { KILOBYTE = 1024, MEGABYTE = (KILOBYTE*1024), GIGABYTE = (MEGABYTE*1024) }; +const char *make_human_readable_str(unsigned long size, unsigned long block_size, unsigned long display_unit); int ask_confirmation(void); int klogctl(int type, char * b, int len); @@ -218,42 +210,54 @@ int klogctl(int type, char * b, int len); char *xgetcwd(char *cwd); char *xreadlink(const char *path); char *concat_path_file(const char *path, const char *filename); -char *last_char_is(char *s, int c); +char *last_char_is(const char *s, int c); -typedef struct ar_headers_s { +typedef struct file_headers_s { char *name; + char *link_name; off_t size; uid_t uid; gid_t gid; mode_t mode; time_t mtime; - off_t offset; - struct ar_headers_s *next; -} ar_headers_t; -extern ar_headers_t *get_ar_headers(FILE *in_file); -extern int seek_ared_file(FILE *in_file, ar_headers_t *headers, const char *tar_gz_file); - -typedef enum extract_function_e { - extract_contents = 1, - extract_control = 2, - extract_info = 4, - extract_extract = 8, - extract_verbose_extract = 16, - extract_list = 32, - extract_fsys_tarfile = 64, - extract_field = 128, - extract_contents_to_file = 256 -} extract_function_t; -extern char *deb_extract(const char *package_filename, int function, - const char *argument, const char *argument2); -extern char *untar(FILE *src_tar_file, FILE *output, int untar_function, - const char *argument, const char *file_prefix); -extern char *read_text_file_to_buffer(FILE *src_file); -extern char *read_package_field(const char *package_buffer); + dev_t device; +} file_header_t; +file_header_t *get_header_ar(FILE *in_file); +file_header_t *get_header_cpio(FILE *src_stream); +file_header_t *get_header_tar(FILE *tar_stream); + +enum extract_functions_e { + extract_verbose_list = 1, + extract_list = 2, + extract_one_to_buffer = 4, + extract_to_stdout = 8, + extract_all_to_fs = 16, + extract_preserve_date = 32, + extract_data_tar_gz = 64, + extract_control_tar_gz = 128, + extract_unzip_only = 256, + extract_unconditional = 512, + extract_create_leading_dirs = 1024, + extract_quiet = 2048, + extract_exclude_list = 4096 +}; +char *unarchive(FILE *src_stream, FILE *out_stream, file_header_t *(*get_header)(FILE *), + const int extract_function, const char *prefix, char **extract_names); +char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function, + const char *prefix, const char *filename); +char *read_package_field(const char *package_buffer); +char *fgets_str(FILE *file, const char *terminating_string); extern int unzip(FILE *l_in_file, FILE *l_out_file); extern void gz_close(int gunzip_pid); -extern int gz_open(FILE *compressed_file, int *pid); +extern FILE *gz_open(FILE *compressed_file, int *pid); + +extern struct hostent *xgethostbyname(const char *name); +extern int create_icmp_socket(void); + +char *dirname (const char *path); + +int make_directory (char *path, mode_t mode, int flags); #define CT_AUTO 0 #define CT_UNIX2DOS 1 @@ -282,5 +286,6 @@ extern const char * const write_error; extern const char * const too_few_args; extern const char * const name_longer_than_foo; extern const char * const unknown; +extern const char * const can_not_create_raw_socket; #endif /* __LIBBB_H__ */