Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

reshuffle libbb.h contents so that order of decls makes sense

Browse Source 
Found bad typo in largefile support :)
This commit is contained in:
Denis Vlasenko 2006-10-27 09:05:02 +00:00
parent 621204bbf6
commit dca0b707c0
6 changed files with 264 additions and 281 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
coreutils/df.c
View File

@ -29,7 +29,7 @@
#ifndef CONFIG_FEATURE_HUMAN_READABLE #ifndef CONFIG_FEATURE_HUMAN_READABLE
static long kscale(long b, long bs) static long kscale(long b, long bs)
{ {
return ( b * (long long) bs + KILOBYTE/2 ) / KILOBYTE; return ( b * (long long) bs + 1024/2 ) / 1024;
} }
#endif #endif
@ -38,7 +38,7 @@ int df_main(int argc, char **argv)
long blocks_used; long blocks_used;
long blocks_percent_used; long blocks_percent_used;
#ifdef CONFIG_FEATURE_HUMAN_READABLE #ifdef CONFIG_FEATURE_HUMAN_READABLE
unsigned long df_disp_hr = KILOBYTE; unsigned long df_disp_hr = 1024;
#endif #endif
int status = EXIT_SUCCESS; int status = EXIT_SUCCESS;
unsigned opt; unsigned opt;
@ -56,7 +56,7 @@ int df_main(int argc, char **argv)
disp_units_hdr = " Size"; disp_units_hdr = " Size";
} }
if (opt & 2) { if (opt & 2) {
df_disp_hr = MEGABYTE; df_disp_hr = 1024*1024;
disp_units_hdr = "1M-blocks"; disp_units_hdr = "1M-blocks";
} }
#else #else

6
coreutils/du.c
View File

@ -27,7 +27,7 @@
#ifdef CONFIG_FEATURE_HUMAN_READABLE #ifdef CONFIG_FEATURE_HUMAN_READABLE
# ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K # ifdef CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
static unsigned long disp_hr = KILOBYTE; static unsigned long disp_hr = 1024;
# else # else
static unsigned long disp_hr = 512; static unsigned long disp_hr = 512;
# endif # endif
@ -180,11 +180,11 @@ int du_main(int argc, char **argv)
} }
if((opt & (1 << 10))) { if((opt & (1 << 10))) {
/* -m opt */ /* -m opt */
disp_hr = MEGABYTE; disp_hr = 1024*1024;
} }
if((opt & (1 << 2))) { if((opt & (1 << 2))) {
/* -k opt */ /* -k opt */
disp_hr = KILOBYTE; disp_hr = 1024;
} }
#else #else
opt_complementary = "H-L:L-H:s-d:d-s"; opt_complementary = "H-L:L-H:s-d:d-s";

2
coreutils/mkdir.c
View File

@ -42,7 +42,7 @@ int mkdir_main (int argc, char **argv)
#endif #endif
opt = getopt32(argc, argv, "m:p", &smode); opt = getopt32(argc, argv, "m:p", &smode);
if(opt & 1) { if(opt & 1) {
mode = 0777; mode = 0777;
if (!bb_parse_mode (smode, &mode)) { if (!bb_parse_mode (smode, &mode)) {
bb_error_msg_and_die ("invalid mode `%s'", smode); bb_error_msg_and_die ("invalid mode `%s'", smode);
} }

520
include/libbb.h
View File

@ -10,7 +10,6 @@
#ifndef __LIBBUSYBOX_H__ #ifndef __LIBBUSYBOX_H__
#define __LIBBUSYBOX_H__ 1 #define __LIBBUSYBOX_H__ 1
//Ok to remove? #include "bb_config.h"
#include "platform.h" #include "platform.h"
#include <ctype.h> #include <ctype.h>
@ -83,7 +82,7 @@
* (in today's world - signed 64bit). For full support of large files, * (in today's world - signed 64bit). For full support of large files,
* we need a few helper #defines (below) and careful use of off_t * we need a few helper #defines (below) and careful use of off_t
* instead of int/ssize_t. No lseek64(), O_LARGEFILE etc necessary */ * instead of int/ssize_t. No lseek64(), O_LARGEFILE etc necessary */
#if ENBALE_LFS #if ENABLE_LFS
/* CONFIG_LFS is on */ /* CONFIG_LFS is on */
# if ULONG_MAX > 0xffffffff # if ULONG_MAX > 0xffffffff
/* "long" is long enough on this system */ /* "long" is long enough on this system */
@ -158,93 +157,107 @@
#endif #endif
typedef struct llist_s { #if (__GLIBC__ < 2)
char *data; int vdprintf(int d, const char *format, va_list ap);
struct llist_s *link; #endif
} llist_t; // This is declared here rather than #including <libgen.h> in order to avoid
extern void llist_add_to(llist_t **old_head, void *data); // confusing the two versions of basename. See the dirname/basename man page
extern void llist_add_to_end(llist_t **list_head, void *data); // for details.
extern void *llist_pop(llist_t **elm); char *dirname(char *path);
extern void llist_free(llist_t *elm, void (*freeit)(void *data)); /* Include our own copy of struct sysinfo to avoid binary compatibility
extern llist_t* rev_llist(llist_t *list); * problems with Linux 2.4, which changed things. Grumble, grumble. */
struct sysinfo {
enum { long uptime; /* Seconds since boot */
LOGMODE_NONE = 0, unsigned long loads[3]; /* 1, 5, and 15 minute load averages */
LOGMODE_STDIO = 1<<0, unsigned long totalram; /* Total usable main memory size */
LOGMODE_SYSLOG = 1<<1, unsigned long freeram; /* Available memory size */
LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO, 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 const char *msg_eol; extern int sysinfo(struct sysinfo* info);
extern int logmode;
extern int die_sleep;
extern void bb_show_usage(void) ATTRIBUTE_NORETURN ATTRIBUTE_EXTERNALLY_VISIBLE;
extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_vherror_msg(const char *s, va_list p);
extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_perror_nomsg_and_die(void) ATTRIBUTE_NORETURN; extern void chomp(char *s);
extern void bb_perror_nomsg(void); extern void trim(char *s);
extern char *skip_whitespace(const char *);
extern void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
/* These two are used internally -- you shouldn't need to use them */
extern void bb_verror_msg(const char *s, va_list p, const char *strerr) __attribute__ ((format (printf, 1, 0)));
extern void bb_vperror_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0)));
extern void bb_vinfo_msg(const char *s, va_list p) __attribute__ ((format (printf, 1, 0)));
extern int bb_echo(int argc, char** argv);
extern int bb_test(int argc, char** argv);
extern const char *bb_mode_string(int mode); extern const char *bb_mode_string(int mode);
extern int is_directory(const char *name, int followLinks, struct stat *statBuf); extern int is_directory(const char *name, int followLinks, struct stat *statBuf);
extern DIR *warn_opendir(const char *path); extern int remove_file(const char *path, int flags);
extern int copy_file(const char *source, const char *dest, int flags);
extern 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 device_open(const char *device, int mode);
extern int get_console_fd(void);
extern char *find_block_device(char *path);
extern off_t bb_copyfd_size(int fd1, int fd2, off_t size);
extern off_t bb_copyfd_eof(int fd1, int fd2);
extern char bb_process_escape_sequence(const char **ptr);
extern char *bb_get_last_path_component(char *path);
extern DIR *xopendir(const char *path); extern DIR *xopendir(const char *path);
extern DIR *warn_opendir(const char *path);
char *xgetcwd(char *cwd);
char *xreadlink(const char *path);
extern void xstat(char *filename, struct stat *buf);
extern pid_t spawn(char **argv);
extern pid_t xspawn(char **argv);
extern int wait4pid(int pid);
extern void xsetgid(gid_t gid);
extern void xsetuid(uid_t uid);
extern void xdaemon(int nochdir, int noclose);
extern void xchdir(const char *path);
extern void xsetenv(const char *key, const char *value);
extern int xopen(const char *pathname, int flags);
extern int xopen3(const char *pathname, int flags, int mode);
extern off_t xlseek(int fd, off_t offset, int whence);
extern off_t fdlength(int fd);
extern int xsocket(int domain, int type, int protocol);
extern void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
extern void xlisten(int s, int backlog);
extern void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen);
extern int xconnect_tcp_v4(struct sockaddr_in *s_addr);
extern struct hostent *xgethostbyname(const char *name);
extern struct hostent *xgethostbyname2(const char *name, int af);
extern char *xstrdup(const char *s);
extern char *xstrndup(const char *s, int n);
extern char *safe_strncpy(char *dst, const char *src, size_t size);
extern char *xasprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
/* dmalloc will redefine these to it's own implementation. It is safe
* to have the prototypes here unconditionally. */
extern void *xmalloc(size_t size);
extern void *xrealloc(void *old, size_t size);
extern void *xzalloc(size_t size);
extern ssize_t safe_read(int fd, void *buf, size_t count); extern ssize_t safe_read(int fd, void *buf, size_t count);
extern ssize_t full_read(int fd, void *buf, size_t count); extern ssize_t full_read(int fd, void *buf, size_t count);
extern void xread(int fd, void *buf, size_t count); extern void xread(int fd, void *buf, size_t count);
extern unsigned char xread_char(int fd); extern unsigned char xread_char(int fd);
extern char *reads(int fd, char *buf, size_t count); extern char *reads(int fd, char *buf, size_t count);
ssize_t read_close(int fd, void *buf, size_t count); extern ssize_t read_close(int fd, void *buf, size_t count);
ssize_t open_read_close(const char *filename, void *buf, size_t count); extern ssize_t open_read_close(const char *filename, void *buf, size_t count);
void *xmalloc_open_read_close(const char *filename, size_t *sizep); extern void *xmalloc_open_read_close(const char *filename, size_t *sizep);
extern ssize_t safe_write(int fd, const void *buf, size_t count); extern ssize_t safe_write(int fd, const void *buf, size_t count);
extern ssize_t full_write(int fd, const void *buf, size_t count); extern ssize_t full_write(int fd, const void *buf, size_t count);
extern void xwrite(int fd, void *buf, size_t count); extern void xwrite(int fd, void *buf, size_t count);
extern int remove_file(const char *path, int flags);
extern int copy_file(const char *source, const char *dest, int flags);
extern 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 bb_parse_mode(const char* s, mode_t* theMode);
extern unsigned int tty_baud_to_value(speed_t speed);
extern speed_t tty_value_to_baud(unsigned int value);
extern int get_linux_version_code(void);
extern int get_console_fd(void);
extern struct mntent *find_mount_point(const char *name, const char *table);
extern void erase_mtab(const char * name);
extern long *find_pid_by_name( const char* pidName);
extern long *pidlist_reverse(long *pidList);
extern char *find_block_device(char *path);
extern off_t bb_copyfd_size(int fd1, int fd2, off_t size);
extern off_t bb_copyfd_eof(int fd1, int fd2);
extern char bb_process_escape_sequence(const char **ptr);
extern char *bb_get_last_path_component(char *path);
/* Reads and prints to stdout till eof, then closes FILE. Exits on error: */ /* Reads and prints to stdout till eof, then closes FILE. Exits on error: */
extern void xprint_and_close_file(FILE *file); extern void xprint_and_close_file(FILE *file);
extern char *xmalloc_fgets(FILE *file); extern char *xmalloc_fgets(FILE *file);
@ -264,49 +277,12 @@ extern FILE *fopen_or_warn(const char *filename, const char *mode);
/* "Opens" stdin if filename is special, else just opens file: */ /* "Opens" stdin if filename is special, else just opens file: */
extern FILE *fopen_or_warn_stdin(const char *filename); extern FILE *fopen_or_warn_stdin(const char *filename);
extern void xstat(char *filename, struct stat *buf);
extern int xsocket(int domain, int type, int protocol);
extern pid_t spawn(char **argv);
extern pid_t xspawn(char **argv);
extern int wait4pid(int pid);
extern void xdaemon(int nochdir, int noclose);
extern void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen);
extern void xlisten(int s, int backlog);
extern void xchdir(const char *path);
extern void utoa_to_buf(unsigned n, char *buf, unsigned buflen); extern void utoa_to_buf(unsigned n, char *buf, unsigned buflen);
extern char *utoa(unsigned n); extern char *utoa(unsigned n);
extern void itoa_to_buf(int n, char *buf, unsigned buflen); extern void itoa_to_buf(int n, char *buf, unsigned buflen);
extern char *itoa(int n); extern char *itoa(int n);
extern void xsetgid(gid_t gid);
extern void xsetuid(uid_t uid);
extern off_t fdlength(int fd);
enum { BB_GETOPT_ERROR = 0x80000000 };
extern const char *opt_complementary;
extern const struct option *applet_long_options;
extern uint32_t option_mask32;
extern uint32_t getopt32(int argc, char **argv, const char *applet_opts, ...);
extern void bb_warn_ignoring_args(int n);
extern void chomp(char *s);
extern void trim(char *s);
extern char *skip_whitespace(const char *);
#ifndef BUILD_INDIVIDUAL
extern struct BB_applet *find_applet_by_name(const char *name);
extern void run_applet_by_name(const char *name, int argc, char **argv);
#endif
/* dmalloc will redefine these to it's own implementation. It is safe
* to have the prototypes here unconditionally. */
extern void *xmalloc(size_t size);
extern void *xrealloc(void *old, size_t size);
extern void *xzalloc(size_t size);
extern char *xstrdup(const char *s);
extern char *xstrndup(const char *s, int n);
extern char *safe_strncpy(char *dst, const char *src, size_t size);
// FIXME: the prototype doesn't match libc strtoXX -> confusion // FIXME: the prototype doesn't match libc strtoXX -> confusion
// FIXME: alot of unchecked strtoXXX are still in tree // FIXME: alot of unchecked strtoXXX are still in tree
// FIXME: atoi_or_else(str, N)? // FIXME: atoi_or_else(str, N)?
@ -321,9 +297,8 @@ extern int safe_strtou32(const char *arg, uint32_t* value);
struct suffix_mult { struct suffix_mult {
const char *suffix; const char *suffix;
unsigned int mult; unsigned mult;
}; };
unsigned long long xstrtoull(const char *numstr, int base); unsigned long long xstrtoull(const char *numstr, int base);
unsigned long long xatoull(const char *numstr); unsigned long long xatoull(const char *numstr);
unsigned long xstrtoul_range_sfx(const char *numstr, int base, unsigned long xstrtoul_range_sfx(const char *numstr, int base,
@ -371,6 +346,7 @@ uint32_t xatou32(const char *numstr);
/* Useful for reading port numbers */ /* Useful for reading port numbers */
uint16_t xatou16(const char *numstr); uint16_t xatou16(const char *numstr);
/* These parse entries in /etc/passwd and /etc/group. This is desirable /* 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 * for BusyBox since we want to avoid using the glibc NSS stuff, which
* increases target size and is often not needed on embedded systems. */ * increases target size and is often not needed on embedded systems. */
@ -379,7 +355,6 @@ extern long bb_xgetgrnam(const char *name);
extern char *bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix); extern char *bb_getug(char *buffer, char *idname, long id, int bufsize, char prefix);
extern char *bb_getpwuid(char *name, long uid, int bufsize); extern char *bb_getpwuid(char *name, long uid, int bufsize);
extern char *bb_getgrgid(char *group, long gid, int bufsize); extern char *bb_getgrgid(char *group, long gid, int bufsize);
extern char *bb_askpass(int timeout, const char * prompt);
/* from chpst */ /* from chpst */
struct bb_uidgid_t { struct bb_uidgid_t {
uid_t uid; uid_t uid;
@ -388,49 +363,80 @@ struct bb_uidgid_t {
extern unsigned uidgid_get(struct bb_uidgid_t*, const char* /*, unsigned*/); extern unsigned uidgid_get(struct bb_uidgid_t*, const char* /*, unsigned*/);
extern int device_open(const char *device, int mode); enum { BB_GETOPT_ERROR = 0x80000000 };
extern const char *opt_complementary;
extern const struct option *applet_long_options;
extern uint32_t option_mask32;
extern uint32_t getopt32(int argc, char **argv, const char *applet_opts, ...);
typedef struct llist_s {
char *data;
struct llist_s *link;
} llist_t;
extern void llist_add_to(llist_t **old_head, void *data);
extern void llist_add_to_end(llist_t **list_head, void *data);
extern void *llist_pop(llist_t **elm);
extern void llist_free(llist_t *elm, void (*freeit)(void *data));
extern llist_t* rev_llist(llist_t *list);
enum {
LOGMODE_NONE = 0,
LOGMODE_STDIO = 1<<0,
LOGMODE_SYSLOG = 1<<1,
LOGMODE_BOTH = LOGMODE_SYSLOG + LOGMODE_STDIO,
};
extern const char *msg_eol;
extern int logmode;
extern int die_sleep;
extern int xfunc_error_retval;
extern void bb_show_usage(void) ATTRIBUTE_NORETURN ATTRIBUTE_EXTERNALLY_VISIBLE;
extern void bb_error_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_error_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_perror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_perror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_vherror_msg(const char *s, va_list p);
extern void bb_herror_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
extern void bb_herror_msg_and_die(const char *s, ...) __attribute__ ((noreturn, format (printf, 1, 2)));
extern void bb_perror_nomsg_and_die(void) ATTRIBUTE_NORETURN;
extern void bb_perror_nomsg(void);
extern void bb_info_msg(const char *s, ...) __attribute__ ((format (printf, 1, 2)));
/* These two are used internally -- you shouldn't need to use them */
extern void bb_verror_msg(const char *s, va_list p, const char *strerr);
extern void bb_vperror_msg(const char *s, va_list p);
extern void bb_vinfo_msg(const char *s, va_list p);
extern int bb_echo(int argc, char** argv);
extern int bb_test(int argc, char** argv);
#ifndef BUILD_INDIVIDUAL
extern struct BB_applet *find_applet_by_name(const char *name);
extern void run_applet_by_name(const char *name, int argc, char **argv);
#endif
extern struct mntent *find_mount_point(const char *name, const char *table);
extern void erase_mtab(const char * name);
extern unsigned int tty_baud_to_value(speed_t speed);
extern speed_t tty_value_to_baud(unsigned int value);
extern void bb_warn_ignoring_args(int n);
extern int get_linux_version_code(void);
extern char *query_loop(const char *device); extern char *query_loop(const char *device);
extern int del_loop(const char *device); extern int del_loop(const char *device);
extern int set_loop(char **device, const char *file, unsigned long long offset); extern int set_loop(char **device, const char *file, unsigned long long offset);
#if (__GLIBC__ < 2)
extern int vdprintf(int d, const char *format, va_list ap);
#endif
/* Include our own copy of struct sysinfo to avoid binary compatibility
* 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 long size, const char *make_human_readable_str(unsigned long long size,
unsigned long block_size, unsigned long display_unit); unsigned long block_size, unsigned long display_unit);
char *bb_askpass(int timeout, const char * prompt);
int bb_ask_confirmation(void); int bb_ask_confirmation(void);
int klogctl(int type, char * b, int len); int klogctl(int type, char * b, int len);
char *xgetcwd(char *cwd); extern int bb_parse_mode(const char* s, mode_t* theMode);
char *xreadlink(const char *path);
char *concat_path_file(const char *path, const char *filename); char *concat_path_file(const char *path, const char *filename);
char *concat_subpath_file(const char *path, const char *filename); char *concat_subpath_file(const char *path, const char *filename);
char *last_char_is(const char *s, int c); char *last_char_is(const char *s, int c);
@ -439,23 +445,14 @@ int execable_file(const char *name);
char *find_execable(const char *filename); char *find_execable(const char *filename);
int exists_execable(const char *filename); int exists_execable(const char *filename);
extern USE_DESKTOP(long long) int uncompress(int fd_in, int fd_out); USE_DESKTOP(long long) int uncompress(int fd_in, int fd_out);
extern int inflate(int in, int out); int inflate(int in, int out);
extern struct hostent *xgethostbyname(const char *name); int create_icmp_socket(void);
extern struct hostent *xgethostbyname2(const char *name, int af); int create_icmp6_socket(void);
extern int create_icmp_socket(void);
extern int create_icmp6_socket(void);
extern void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen);
extern int xconnect_tcp_v4(struct sockaddr_in *s_addr);
extern unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port); unsigned short bb_lookup_port(const char *port, const char *protocol, unsigned short default_port);
extern void bb_lookup_host(struct sockaddr_in *s_in, const char *host); void bb_lookup_host(struct sockaddr_in *s_in, const char *host);
// This is declared here rather than #including <libgen.h> in order to avoid
// confusing the two versions of basename. See the dirname/basename man page
// for details.
char *dirname(char *path);
int bb_make_directory(char *path, long mode, int flags); int bb_make_directory(char *path, long mode, int flags);
@ -464,6 +461,96 @@ const char *get_signame(int number);
char *bb_simplify_path(const char *path); char *bb_simplify_path(const char *path);
#define FAIL_DELAY 3
extern void bb_do_delay(int seconds);
extern void change_identity(const struct passwd *pw);
extern const char *change_identity_e2str(const struct passwd *pw);
extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args);
#ifdef CONFIG_SELINUX
extern void renew_current_security_context(void);
extern void set_current_security_context(security_context_t sid);
#endif
extern int run_parts(char **args, const unsigned char test_mode, char **env);
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);
extern char *pw_encrypt(const char *clear, const char *salt);
extern int obscure(const char *old, const char *newval, const struct passwd *pwdp);
extern int compare_string_array(const char * const string_array[], const char *key);
extern void print_login_issue(const char *issue_file, const char *tty);
extern void print_login_prompt(void);
#ifdef BB_NOMMU
extern void vfork_daemon(int nochdir, int noclose);
extern void vfork_daemon_rexec(int nochdir, int noclose,
int argc, char **argv, char *foreground_opt);
#endif
extern int get_terminal_width_height(int fd, int *width, int *height);
extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char *));
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);
#ifndef COMM_LEN
#ifdef TASK_COMM_LEN
#define COMM_LEN TASK_COMM_LEN
#else
/* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */
#define COMM_LEN 16
#endif
#endif
typedef struct {
int pid;
char user[9];
char state[4];
unsigned long rss;
int ppid;
#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
unsigned pcpu;
unsigned pscpu;
unsigned long stime, utime;
#endif
char *cmd;
/* basename of executable file in call to exec(2),
size from kernel headers */
char short_cmd[COMM_LEN];
} procps_status_t;
procps_status_t* procps_scan(int save_user_arg0);
long *find_pid_by_name( const char* pidName);
long *pidlist_reverse(long *pidList);
extern const char bb_uuenc_tbl_base64[];
extern const char bb_uuenc_tbl_std[];
void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
typedef struct _sha1_ctx_t_ {
uint32_t count[2];
uint32_t hash[5];
uint32_t wbuf[16];
} sha1_ctx_t;
void sha1_begin(sha1_ctx_t *ctx);
void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);
void *sha1_end(void *resbuf, sha1_ctx_t *ctx);
typedef struct _md5_ctx_t_ {
uint32_t A;
uint32_t B;
uint32_t C;
uint32_t D;
uint64_t total;
uint32_t buflen;
char buffer[128];
} md5_ctx_t;
void md5_begin(md5_ctx_t *ctx);
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
void *md5_end(void *resbuf, md5_ctx_t *ctx);
uint32_t *crc32_filltable(int endian);
enum { /* DO NOT CHANGE THESE VALUES! cp.c depends on them. */ enum { /* DO NOT CHANGE THESE VALUES! cp.c depends on them. */
FILEUTILS_PRESERVE_STATUS = 1, FILEUTILS_PRESERVE_STATUS = 1,
FILEUTILS_DEREFERENCE = 2, FILEUTILS_DEREFERENCE = 2,
@ -476,6 +563,7 @@ enum { /* DO NOT CHANGE THESE VALUES! cp.c depends on them. */
#define FILEUTILS_CP_OPTSTR "pdRfils" #define FILEUTILS_CP_OPTSTR "pdRfils"
extern const char *applet_name; extern const char *applet_name;
extern const char BB_BANNER[];
extern const char bb_msg_full_version[]; extern const char bb_msg_full_version[];
extern const char bb_msg_memory_exhausted[]; extern const char bb_msg_memory_exhausted[];
@ -491,6 +579,7 @@ extern const char bb_msg_invalid_arg[];
extern const char bb_msg_standard_input[]; extern const char bb_msg_standard_input[];
extern const char bb_msg_standard_output[]; extern const char bb_msg_standard_output[];
extern const char bb_path_mtab_file[];
extern const char bb_path_nologin_file[]; extern const char bb_path_nologin_file[];
extern const char bb_path_passwd_file[]; extern const char bb_path_passwd_file[];
extern const char bb_path_shadow_file[]; extern const char bb_path_shadow_file[];
@ -506,14 +595,11 @@ extern const char bb_dev_null[];
#endif #endif
extern char bb_common_bufsiz1[BUFSIZ+1]; extern char bb_common_bufsiz1[BUFSIZ+1];
/* /* You can change LIBBB_DEFAULT_LOGIN_SHELL, but don't use it,
* You can change LIBBB_DEFAULT_LOGIN_SHELL, but don`t use, * use bb_default_login_shell and following defines.
* use bb_default_login_shell and next defines, * If you change LIBBB_DEFAULT_LOGIN_SHELL,
* if you LIBBB_DEFAULT_LOGIN_SHELL change, * don't forget to change increment constant. */
* don`t lose change increment constant!
*/
#define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh" #define LIBBB_DEFAULT_LOGIN_SHELL "-/bin/sh"
extern const char bb_default_login_shell[]; extern const char bb_default_login_shell[];
/* "/bin/sh" */ /* "/bin/sh" */
#define DEFAULT_SHELL (bb_default_login_shell+1) #define DEFAULT_SHELL (bb_default_login_shell+1)
@ -521,10 +607,6 @@ extern const char bb_default_login_shell[];
#define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6) #define DEFAULT_SHELL_SHORT_NAME (bb_default_login_shell+6)
extern const char bb_path_mtab_file[];
extern int xfunc_error_retval;
#ifdef CONFIG_FEATURE_DEVFS #ifdef CONFIG_FEATURE_DEVFS
# define CURRENT_VC "/dev/vc/0" # define CURRENT_VC "/dev/vc/0"
# define VC_1 "/dev/vc/1" # define VC_1 "/dev/vc/1"
@ -570,116 +652,16 @@ extern int xfunc_error_retval;
# define FB_0 "/dev/fb0" # define FB_0 "/dev/fb0"
#endif #endif
/* The following devices are the same on devfs and non-devfs systems. */ /* The following devices are the same on devfs and non-devfs systems. */
#define CURRENT_TTY "/dev/tty" #define CURRENT_TTY "/dev/tty"
#define CONSOLE_DEV "/dev/console" #define CONSOLE_DEV "/dev/console"
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);
char *xasprintf(const char *format, ...) __attribute__ ((format (printf, 1, 2)));
#define FAIL_DELAY 3
extern void bb_do_delay(int seconds);
extern void change_identity(const struct passwd *pw);
extern const char *change_identity_e2str(const struct passwd *pw);
extern void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args);
#ifdef CONFIG_SELINUX
extern void renew_current_security_context(void);
extern void set_current_security_context(security_context_t sid);
#endif
extern int run_parts(char **args, const unsigned char test_mode, char **env);
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);
extern char *pw_encrypt(const char *clear, const char *salt);
extern int obscure(const char *old, const char *newval, const struct passwd *pwdp);
extern void xsetenv(const char *key, const char *value);
extern int xopen(const char *pathname, int flags);
extern int xopen3(const char *pathname, int flags, int mode);
extern off_t xlseek(int fd, off_t offset, int whence);
extern const char bb_uuenc_tbl_base64[];
extern const char bb_uuenc_tbl_std[];
extern void bb_uuencode(const unsigned char *s, char *store, const int length, const char *tbl);
#ifndef COMM_LEN
#ifdef TASK_COMM_LEN
#define COMM_LEN TASK_COMM_LEN
#else
/* synchronize with sizeof(task_struct.comm) in /usr/include/linux/sched.h */
#define COMM_LEN 16
#endif
#endif
typedef struct {
int pid;
char user[9];
char state[4];
unsigned long rss;
int ppid;
#ifdef CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
unsigned pcpu;
unsigned pscpu;
unsigned long stime, utime;
#endif
char *cmd;
/* basename of executable file in call to exec(2),
size from kernel headers */
char short_cmd[COMM_LEN];
} procps_status_t;
extern procps_status_t * procps_scan(int save_user_arg0);
extern int compare_string_array(const char * const string_array[], const char *key);
extern void print_login_issue(const char *issue_file, const char *tty);
extern void print_login_prompt(void);
#ifdef BB_NOMMU
extern void vfork_daemon(int nochdir, int noclose);
extern void vfork_daemon_rexec(int nochdir, int noclose,
int argc, char **argv, char *foreground_opt);
#endif
extern int get_terminal_width_height(int fd, int *width, int *height);
extern unsigned long get_ug_id(const char *s, long (*__bb_getxxnam)(const char *));
typedef struct _sha1_ctx_t_ {
uint32_t count[2];
uint32_t hash[5];
uint32_t wbuf[16];
} sha1_ctx_t;
void sha1_begin(sha1_ctx_t *ctx);
void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx);
void *sha1_end(void *resbuf, sha1_ctx_t *ctx);
typedef struct _md5_ctx_t_ {
uint32_t A;
uint32_t B;
uint32_t C;
uint32_t D;
uint64_t total;
uint32_t buflen;
char buffer[128];
} md5_ctx_t;
void md5_begin(md5_ctx_t *ctx);
void md5_hash(const void *data, size_t length, md5_ctx_t *ctx);
void *md5_end(void *resbuf, md5_ctx_t *ctx);
extern uint32_t *crc32_filltable (int endian);
#ifndef RB_POWER_OFF #ifndef RB_POWER_OFF
/* Stop system and switch power off if possible. */ /* Stop system and switch power off if possible. */
#define RB_POWER_OFF 0x4321fedc #define RB_POWER_OFF 0x4321fedc
#endif #endif
extern const char BB_BANNER[];
// Make sure we call functions instead of macros. // Make sure we call functions instead of macros.
#undef isalnum #undef isalnum
#undef isalpha #undef isalpha

2
init/init.c
View File

@ -1035,7 +1035,7 @@ int init_main(int argc, char **argv)
struct sysinfo info; struct sysinfo info;
if (!sysinfo(&info) && if (!sysinfo(&info) &&
(info.mem_unit ? : 1) * (long long)info.totalram < MEGABYTE) (info.mem_unit ? : 1) * (long long)info.totalram < 1024*1024)
{ {
message(CONSOLE,"Low memory: forcing swapon."); message(CONSOLE,"Low memory: forcing swapon.");
/* swapon -a requires /proc typically */ /* swapon -a requires /proc typically */

9
libbb/human_readable.c
View File

@ -58,12 +58,13 @@ const char *make_human_readable_str(unsigned long long size,
val /= display_unit; /* Don't combine with the line above!!! */ val /= display_unit; /* Don't combine with the line above!!! */
} else { } else {
++u; ++u;
while ((val >= KILOBYTE) while ((val >= 1024)
&& (u < zero_and_units + sizeof(zero_and_units) - 1)) { && (u < zero_and_units + sizeof(zero_and_units) - 1)
) {
f = fmt_tenths; f = fmt_tenths;
++u; ++u;
frac = ((((int)(val % KILOBYTE)) * 10) + (KILOBYTE/2)) / KILOBYTE; frac = (((int)(val % 1024)) * 10 + 1024/2) / 1024;
val /= KILOBYTE; val /= 1024;
} }
if (frac >= 10) { /* We need to round up here. */ if (frac >= 10) { /* We need to round up here. */
++val; ++val;