diff options
| -rw-r--r-- | libbb/libbb.h | 234 | ||||
| -rw-r--r-- | libbb/make_directory.c | 1 | ||||
| -rw-r--r-- | libbb/messages.c | 45 | ||||
| -rw-r--r-- | libbb/xfuncs.c | 2 |
4 files changed, 6 insertions, 276 deletions
diff --git a/libbb/libbb.h b/libbb/libbb.h index 3e0a5ab..0665921 100644 --- a/libbb/libbb.h +++ b/libbb/libbb.h @@ -27,74 +27,15 @@ #include <netdb.h> -// Include because of single use with opkg -#define _BB_INTERNAL_H_ -#define L_archive_offset -#define L_get_header_ar -#define L_free_header_tar -#define L_get_header_tar -#define L_unarchive -#define L_seek_sub_file -#define L_memory_exhausted -#define L_deb_extract -#define L_extract_archive -#define L_parse_mode -#define L_time_string -#define L_mode_string - -#ifndef _BB_INTERNAL_H_ -#include "../busybox.h" -#endif - -#ifdef DMALLOC -#include "dmalloc.h" -#endif - #include <features.h> -#if (__GNU_LIBRARY__ < 5) && (!defined __dietlibc__) -/* libc5 doesn't define socklen_t */ -typedef unsigned int socklen_t; -/* libc5 doesn't implement BSD 4.4 daemon() */ -extern int daemon (int nochdir, int noclose); -/* libc5 doesn't implement strtok_r */ -char *strtok_r(char *s, const char *delim, char **ptrptr); -#endif - -/* Some useful definitions */ #define FALSE ((int) 0) #define TRUE ((int) 1) -#define SKIP ((int) 2) - -/* for mtab.c */ -#define MTAB_GETMOUNTPT '1' -#define MTAB_GETDEVICE '2' - -#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)) -#endif - -#ifndef MAX -#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))); 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)); extern void archive_xread_all(int fd, char *buf, size_t count); /* These two are used internally -- you shouldn't need to use them */ @@ -103,129 +44,28 @@ extern void vperror_msg(const char *s, va_list p); const char *mode_string(int mode); const char *time_string(time_t timeVal); -int is_directory(const char *name, int followLinks, struct stat *statBuf); -int isDevice(const char *name); -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); -char *buildName(const char *dirName, const char *fileName); -int makeString(int argc, const char **argv, char *buf, int bufLen); -char *getChunk(int size); -char *chunkstrdup(const char *str); -void freeChunks(void); ssize_t safe_read(int fd, void *buf, size_t count); -ssize_t full_write(int fd, const char *buf, int len); ssize_t full_read(int fd, char *buf, int len); -int recursive_action(const char *fileName, int recurse, int followLinks, int depthFirst, - int (*fileAction) (const char *fileName, struct stat* statbuf, void* userData), - int (*dirAction) (const char *fileName, struct stat* statbuf, void* userData), - void* userData); 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 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 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); extern FILE *wfopen(const char *path, const char *mode); extern FILE *xfopen(const char *path, const char *mode); -extern void chomp(char *s); -extern struct BB_applet *find_applet_by_name(const char *name); -void run_applet_by_name(const char *name, int argc, char **argv); -#ifndef DMALLOC extern void *xmalloc (size_t size); extern void *xrealloc(void *old, size_t size); extern void *xcalloc(size_t nmemb, size_t size); extern char *xstrdup (const char *s); -#endif extern char *xstrndup (const char *s, int n); -extern char * safe_strncpy(char *dst, const char *src, size_t size); - -struct suffix_mult { - const char *suffix; - int mult; -}; - -extern unsigned long parse_number(const char *numstr, - const struct suffix_mult *suffixes); - - -/* These parse entries in /etc/passwd and /etc/group. This is desirable - * for BusyBox since we want to avoid using the glibc NSS stuff, which - * 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 long my_getpwnamegid(const char *name); - -extern int device_open(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); -extern char *find_unused_loop_device (void); +extern char *safe_strncpy(char *dst, const char *src, size_t size); - -#if (__GLIBC__ < 2) -extern int vdprintf(int d, const char *format, va_list ap); -#endif - -int nfsmount(const char *spec, const char *node, int *flags, - char **extra_opts, char **mount_opts, int running_bg); - -void syslog_msg_with_name(const char *name, int facility, int pri, const char *msg); -void syslog_msg(int facility, int pri, const char *msg); - -/* Include our own copy of struct sysinfo to avoid binary compatability - * problems with Linux 2.4, which changed things. Grumble, grumble. */ -struct sysinfo { - long uptime; /* Seconds since boot */ - unsigned long loads[3]; /* 1, 5, and 15 minute load averages */ - unsigned long totalram; /* Total usable main memory size */ - unsigned long freeram; /* Available memory size */ - unsigned long sharedram; /* Amount of shared memory */ - unsigned long bufferram; /* Memory used by buffers */ - 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 */ - char _f[20-2*sizeof(long)-sizeof(int)]; /* Padding: libc5 uses this.. */ -}; -extern int sysinfo (struct sysinfo* info); - -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 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(const char *s, int c); -extern long arith (const char *startbuf, int *errcode); - typedef struct file_headers_s { char *name; char *link_name; @@ -236,10 +76,6 @@ typedef struct file_headers_s { time_t mtime; dev_t device; } file_header_t; -file_header_t *get_header_ar(FILE *in_file); -void free_header_ar(file_header_t *ar_entry); -file_header_t *get_header_tar(FILE *tar_stream); -void free_header_tar(file_header_t *tar_entry); enum extract_functions_e { extract_verbose_list = 1, @@ -256,30 +92,16 @@ enum extract_functions_e { extract_quiet = 2048, extract_exclude_list = 4096 }; -char *deb_extract(const char *package_filename, FILE *out_stream, const int extract_function, - const char *prefix, const char *filename); -int read_package_field(const char *package_buffer, char **field_name, char **field_value); -char *fgets_str(FILE *file, const char *terminating_string); + +char *deb_extract(const char *package_filename, FILE *out_stream, + const int extract_function, const char *prefix, const char *filename); 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 struct hostent *xgethostbyname(const char *name); -extern int create_icmp_socket(void); - -char *dirname (char *path); - int make_directory (const char *path, long mode, int flags); -const char *u_signal_names(const char *str_sig, int *signo, int startnum); -char *simplify_path(const char *path); - -#define CT_AUTO 0 -#define CT_UNIX2DOS 1 -#define CT_DOS2UNIX 2 -/* extern int convert(char *fn, int ConvType); */ - enum { FILEUTILS_PRESERVE_STATUS = 1, FILEUTILS_PRESERVE_SYMLINKS = 2, @@ -288,54 +110,6 @@ enum { }; extern const char *applet_name; -extern const char * const full_version; -extern const char * const name_too_long; -extern const char * const omitting_directory; -extern const char * const not_a_directory; extern const char * const memory_exhausted; -extern const char * const invalid_date; -extern const char * const invalid_option; -extern const char * const io_error; -extern const char * const dash_dash_help; -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; - -#ifdef BB_FEATURE_DEVFS -# define CURRENT_VC "/dev/vc/0" -# define VC_1 "/dev/vc/1" -# define VC_2 "/dev/vc/2" -# define VC_3 "/dev/vc/3" -# define VC_4 "/dev/vc/4" -# define VC_5 "/dev/vc/5" -# define SC_0 "/dev/tts/0" -# define SC_1 "/dev/tts/1" -# define VC_FORMAT "/dev/vc/%d" -# define SC_FORMAT "/dev/tts/%d" -# define LOOP_FORMAT "/dev/loop/%d" -#else -# define CURRENT_VC "/dev/tty0" -# define VC_1 "/dev/tty1" -# define VC_2 "/dev/tty2" -# define VC_3 "/dev/tty3" -# define VC_4 "/dev/tty4" -# define VC_5 "/dev/tty5" -# define SC_0 "/dev/ttyS0" -# define SC_1 "/dev/ttyS1" -# define VC_FORMAT "/dev/tty%d" -# define SC_FORMAT "/dev/ttyS%d" -# define LOOP_FORMAT "/dev/loop%d" -#endif - -/* The following devices are the same on devfs and non-devfs systems. */ -#define CURRENT_TTY "/dev/tty" -#define CONSOLE_DEV "/dev/console" - -/* Cope with mmu-less systems somewhat gracefully */ -#if defined(__UCLIBC__) && !defined(__ARCH_HAS_MMU__) -#define fork vfork -#endif #endif /* __LIBBB_H__ */ diff --git a/libbb/make_directory.c b/libbb/make_directory.c index 5fa2a7e..cff2e51 100644 --- a/libbb/make_directory.c +++ b/libbb/make_directory.c @@ -26,6 +26,7 @@ #include <sys/types.h> #include <unistd.h> #include <stdlib.h> +#include <libgen.h> #include "libbb.h" diff --git a/libbb/messages.c b/libbb/messages.c index 47b5526..b9334c4 100644 --- a/libbb/messages.c +++ b/libbb/messages.c @@ -21,47 +21,4 @@ #include "libbb.h" -#ifdef L_full_version - const char * const full_version = BB_BANNER " multi-call binary"; -#endif -#ifdef L_name_too_long - const char * const name_too_long = "file name too long"; -#endif - -#ifdef L_omitting_directory - const char * const omitting_directory = "%s: omitting directory"; -#endif -#ifdef L_not_a_directory - const char * const not_a_directory = "%s: not a directory"; -#endif -#ifdef L_memory_exhausted - const char * const memory_exhausted = "memory exhausted"; -#endif -#ifdef L_invalid_date - const char * const invalid_date = "invalid date `%s'"; -#endif -#ifdef L_invalid_option - const char * const invalid_option = "invalid option -- %c"; -#endif -#ifdef L_io_error - const char * const io_error = "%s: input/output error -- %s"; -#endif -#ifdef L_dash_dash_help - const char * const dash_dash_help = "--help"; -#endif -#ifdef L_write_error - const char * const write_error = "Write Error"; -#endif -#ifdef L_too_few_args - const char * const too_few_args = "too few arguments"; -#endif -#ifdef L_name_longer_than_foo - const char * const name_longer_than_foo = "Names longer than %d chars not supported."; -#endif -#ifdef L_unknown - const char * const unknown = "(unknown)"; -#endif - -#ifdef L_can_not_create_raw_socket - const char * const can_not_create_raw_socket = "can`t create raw socket"; -#endif +const char * const memory_exhausted = "memory exhausted"; diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c index 57c6980..c12b282 100644 --- a/libbb/xfuncs.c +++ b/libbb/xfuncs.c @@ -26,7 +26,6 @@ #include "libbb.h" -#ifndef DMALLOC extern void *xmalloc(size_t size) { void *ptr = malloc(size); @@ -64,7 +63,6 @@ extern char * xstrdup (const char *s) { return t; } -#endif extern char * xstrndup (const char *s, int n) { char *t; |