X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Flibbb.h;h=a9c1a870f7f670896804a8daea100ff451178064;hb=6fc92a506ab3c490a4dc028334c908f19c0d0806;hp=f24a38109ccb9feb08551d0e628c3e24a2be67b1;hpb=9aff9036035fbed074e8e711b96c5c934e668884;p=oweals%2Fbusybox.git

diff --git a/libbb/libbb.h b/libbb/libbb.h
index f24a38109..a9c1a870f 100644
--- a/libbb/libbb.h
+++ b/libbb/libbb.h
@@ -108,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);
@@ -198,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);
@@ -221,15 +220,11 @@ typedef struct file_headers_s {
 	gid_t gid;
 	mode_t mode;
 	time_t mtime;
-	off_t offset;
 	dev_t device;
-	struct file_headers_s *next;
-} file_headers_t;
-file_headers_t *get_ar_headers(FILE *in_file);
-file_headers_t *get_tar_headers(FILE *tar_stream);
-file_headers_t *get_tar_gz_headers(FILE *compressed_stream);
-file_headers_t *append_archive_list(file_headers_t *head, file_headers_t *tail_entry);
-file_headers_t *add_from_archive_list(file_headers_t *master_list, file_headers_t *new_list, const char *name);
+} 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,
@@ -240,20 +235,29 @@ enum extract_functions_e {
 	extract_preserve_date = 32,
 	extract_data_tar_gz = 64,
 	extract_control_tar_gz = 128,
-	extract_unzip_only = 256
+	extract_unzip_only = 256,
+	extract_unconditional = 512,
+	extract_create_leading_dirs = 1024,
+	extract_quiet = 2048,
+	extract_exclude_list = 4096
 };
-char *extract_archive(FILE *src_stream, FILE *out_stream, file_headers_t *extract_headers, int function, const char *prefix);
-char *deb_extract(const char *package_filename, FILE *out_stream, const int function,
+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);
-int seek_sub_file(FILE *in_file, file_headers_t *headers, const char *tar_gz_file);
 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__ */