*: introduce and use FAST_FUNC: regparm on i386, otherwise no-on

text    data     bss     dec     hex filename
 808035     611    6868  815514   c719a busybox_old
 804472     611    6868  811951   c63af busybox_unstripped
This commit is contained in:
Denis Vlasenko
2008-06-27 02:52:20 +00:00
parent 26bc57d8b2
commit defc1ea340
176 changed files with 844 additions and 838 deletions

View File

@@ -101,7 +101,7 @@ static void full_write2_str(const char *str)
full_write(STDERR_FILENO, str, strlen(str));
}
void bb_show_usage(void)
void FAST_FUNC bb_show_usage(void)
{
if (ENABLE_SHOW_USAGE) {
#ifdef SINGLE_APPLET_STR
@@ -153,7 +153,7 @@ static int applet_name_compare(const void *name, const void *v)
return strcmp(name, APPLET_NAME(i));
}
#endif
int find_applet_by_name(const char *name)
int FAST_FUNC find_applet_by_name(const char *name)
{
#if NUM_APPLETS > 8
/* Do a binary search to find the applet entry given the name. */
@@ -704,7 +704,7 @@ static int busybox_main(char **argv)
xfunc_die();
}
void run_applet_no_and_exit(int applet_no, char **argv)
void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
{
int argc = 1;
@@ -722,7 +722,7 @@ void run_applet_no_and_exit(int applet_no, char **argv)
exit(applet_main[applet_no](argc, argv));
}
void run_applet_and_exit(const char *name, char **argv)
void FAST_FUNC run_applet_and_exit(const char *name, char **argv)
{
int applet = find_applet_by_name(name);
if (applet >= 0)

View File

@@ -13,7 +13,7 @@
#include "libbb.h"
int bb_ask_confirmation(void)
int FAST_FUNC bb_ask_confirmation(void)
{
int retval = 0;
int first = 1;

View File

@@ -17,7 +17,7 @@ static void askpass_timeout(int ATTRIBUTE_UNUSED ignore)
{
}
char *bb_askpass(int timeout, const char *prompt)
char* FAST_FUNC bb_askpass(int timeout, const char *prompt)
{
/* Was static char[BIGNUM] */
enum { sizeof_passwd = 128 };

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
const char *bb_basename(const char *name)
const char* FAST_FUNC bb_basename(const char *name)
{
const char *cp = strrchr(name, '/');
if (cp)

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_do_delay(int seconds)
void FAST_FUNC bb_do_delay(int seconds)
{
time_t start, now;

View File

@@ -45,7 +45,7 @@ static char* bb_getug(char *buffer, int bufsize, char *idname, long id, char pre
* bb_getXXXid(NULL, -1, id) - return user/group name or exit
*/
/* gets a username given a uid */
char* bb_getpwuid(char *name, int bufsize, long uid)
char* FAST_FUNC bb_getpwuid(char *name, int bufsize, long uid)
{
struct passwd *myuser = getpwuid(uid);
@@ -54,7 +54,7 @@ char* bb_getpwuid(char *name, int bufsize, long uid)
uid, 'u');
}
/* gets a groupname given a gid */
char* bb_getgrgid(char *group, int bufsize, long gid)
char* FAST_FUNC bb_getgrgid(char *group, int bufsize, long gid)
{
struct group *mygroup = getgrgid(gid);
@@ -64,7 +64,7 @@ char* bb_getgrgid(char *group, int bufsize, long gid)
}
/* returns a gid given a group name */
long xgroup2gid(const char *name)
long FAST_FUNC xgroup2gid(const char *name)
{
struct group *mygroup;
@@ -76,7 +76,7 @@ long xgroup2gid(const char *name)
}
/* returns a uid given a username */
long xuname2uid(const char *name)
long FAST_FUNC xuname2uid(const char *name)
{
struct passwd *myuser;
@@ -87,8 +87,8 @@ long xuname2uid(const char *name)
return myuser->pw_uid;
}
unsigned long get_ug_id(const char *s,
long (*xname2id)(const char *))
unsigned long FAST_FUNC get_ug_id(const char *s,
long FAST_FUNC (*xname2id)(const char *))
{
unsigned long r;

View File

@@ -9,12 +9,12 @@
#include "libbb.h"
int bb_pstrcmp(const void *a, const void *b)
int /* not FAST_FUNC! */ bb_pstrcmp(const void *a, const void *b)
{
return strcmp(*(char**)a, *(char**)b);
}
void qsort_string_vector(char **sv, unsigned count)
void FAST_FUNC qsort_string_vector(char **sv, unsigned count)
{
qsort(sv, count, sizeof(char*), bb_pstrcmp);
}

View File

@@ -48,7 +48,7 @@ static unsigned long long handle_errors(unsigned long long v, char **endp, char
}
unsigned long long bb_strtoull(const char *arg, char **endp, int base)
unsigned long long FAST_FUNC bb_strtoull(const char *arg, char **endp, int base)
{
unsigned long long v;
char *endptr;
@@ -63,7 +63,7 @@ unsigned long long bb_strtoull(const char *arg, char **endp, int base)
return handle_errors(v, endp, endptr);
}
long long bb_strtoll(const char *arg, char **endp, int base)
long long FAST_FUNC bb_strtoll(const char *arg, char **endp, int base)
{
unsigned long long v;
char *endptr;
@@ -75,7 +75,7 @@ long long bb_strtoll(const char *arg, char **endp, int base)
}
#if ULONG_MAX != ULLONG_MAX
unsigned long bb_strtoul(const char *arg, char **endp, int base)
unsigned long FAST_FUNC bb_strtoul(const char *arg, char **endp, int base)
{
unsigned long v;
char *endptr;
@@ -86,7 +86,7 @@ unsigned long bb_strtoul(const char *arg, char **endp, int base)
return handle_errors(v, endp, endptr);
}
long bb_strtol(const char *arg, char **endp, int base)
long FAST_FUNC bb_strtol(const char *arg, char **endp, int base)
{
long v;
char *endptr;
@@ -99,7 +99,7 @@ long bb_strtol(const char *arg, char **endp, int base)
#endif
#if UINT_MAX != ULONG_MAX
unsigned bb_strtou(const char *arg, char **endp, int base)
unsigned FAST_FUNC bb_strtou(const char *arg, char **endp, int base)
{
unsigned long v;
char *endptr;
@@ -111,7 +111,7 @@ unsigned bb_strtou(const char *arg, char **endp, int base)
return handle_errors(v, endp, endptr);
}
int bb_strtoi(const char *arg, char **endp, int base)
int FAST_FUNC bb_strtoi(const char *arg, char **endp, int base)
{
long v;
char *endptr;
@@ -131,7 +131,7 @@ int bb_strtoi(const char *arg, char **endp, int base)
#include <math.h> /* just for HUGE_VAL */
#define NOT_DIGIT(a) (((unsigned char)(a-'0')) > 9)
double bb_strtod(const char *arg, char **endp)
double FAST_FUNC bb_strtod(const char *arg, char **endp)
{
double v;
char *endptr;

View File

@@ -31,7 +31,7 @@
#include "libbb.h"
/* Become the user and group(s) specified by PW. */
void change_identity(const struct passwd *pw)
void FAST_FUNC change_identity(const struct passwd *pw)
{
if (initgroups(pw->pw_name, pw->pw_gid) == -1)
bb_perror_msg_and_die("can't set groups");

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
void chomp(char *s)
void FAST_FUNC chomp(char *s)
{
char *lc = last_char_is(s, '\n');

View File

@@ -7,7 +7,7 @@
/* returns the array index of the string */
/* (index of first match is returned, or -1) */
int index_in_str_array(const char *const string_array[], const char *key)
int FAST_FUNC index_in_str_array(const char *const string_array[], const char *key)
{
int i;
@@ -19,7 +19,7 @@ int index_in_str_array(const char *const string_array[], const char *key)
return -1;
}
int index_in_strings(const char *strings, const char *key)
int FAST_FUNC index_in_strings(const char *strings, const char *key)
{
int idx = 0;
@@ -36,7 +36,7 @@ int index_in_strings(const char *strings, const char *key)
/* returns the array index of the string, even if it matches only a beginning */
/* (index of first match is returned, or -1) */
#ifdef UNUSED
int index_in_substr_array(const char *const string_array[], const char *key)
int FAST_FUNC index_in_substr_array(const char *const string_array[], const char *key)
{
int i;
int len = strlen(key);
@@ -51,7 +51,7 @@ int index_in_substr_array(const char *const string_array[], const char *key)
}
#endif
int index_in_substrings(const char *strings, const char *key)
int FAST_FUNC index_in_substrings(const char *strings, const char *key)
{
int len = strlen(key);
@@ -68,7 +68,7 @@ int index_in_substrings(const char *strings, const char *key)
return -1;
}
const char *nth_string(const char *strings, int n)
const char* FAST_FUNC nth_string(const char *strings, int n)
{
while (n) {
n--;

View File

@@ -16,7 +16,7 @@
#include "libbb.h"
char *concat_path_file(const char *path, const char *filename)
char* FAST_FUNC concat_path_file(const char *path, const char *filename)
{
char *lc;

View File

@@ -15,7 +15,7 @@
#include "libbb.h"
char *concat_subpath_file(const char *path, const char *f)
char* FAST_FUNC concat_subpath_file(const char *path, const char *f)
{
if (f && DOT_OR_DOTDOT(f))
return NULL;

View File

@@ -71,7 +71,7 @@ static int ask_and_unlink(const char *dest, int flags)
* 0 copy is made or user answered "no" in interactive mode
* (failures to preserve mode/owner/times are not reported in exit code)
*/
int copy_file(const char *source, const char *dest, int flags)
int FAST_FUNC copy_file(const char *source, const char *dest, int flags)
{
/* This is a recursive function, try to minimize stack usage */
/* NB: each struct stat is ~100 bytes */

View File

@@ -85,7 +85,7 @@ static off_t bb_full_fd_action(int src_fd, int dst_fd, off_t size)
#if 0
void complain_copyfd_and_die(off_t sz)
void FAST_FUNC complain_copyfd_and_die(off_t sz)
{
if (sz != -1)
bb_error_msg_and_die("short read");
@@ -94,7 +94,7 @@ void complain_copyfd_and_die(off_t sz)
}
#endif
off_t bb_copyfd_size(int fd1, int fd2, off_t size)
off_t FAST_FUNC bb_copyfd_size(int fd1, int fd2, off_t size)
{
if (size) {
return bb_full_fd_action(fd1, fd2, size);
@@ -102,7 +102,7 @@ off_t bb_copyfd_size(int fd1, int fd2, off_t size)
return 0;
}
void bb_copyfd_exact_size(int fd1, int fd2, off_t size)
void FAST_FUNC bb_copyfd_exact_size(int fd1, int fd2, off_t size)
{
off_t sz = bb_copyfd_size(fd1, fd2, size);
if (sz == size)
@@ -113,7 +113,7 @@ void bb_copyfd_exact_size(int fd1, int fd2, off_t size)
xfunc_die();
}
off_t bb_copyfd_eof(int fd1, int fd2)
off_t FAST_FUNC bb_copyfd_eof(int fd1, int fd2)
{
return bb_full_fd_action(fd1, fd2, 0);
}

View File

@@ -36,7 +36,7 @@
*
* NULL pw means "just fake it for login with bad username" */
int correct_password(const struct passwd *pw)
int FAST_FUNC correct_password(const struct passwd *pw)
{
char *unencrypted, *encrypted;
const char *correct;

View File

@@ -16,7 +16,7 @@
#include "libbb.h"
uint32_t *crc32_filltable(uint32_t *crc_table, int endian)
uint32_t* FAST_FUNC crc32_filltable(uint32_t *crc_table, int endian)
{
uint32_t polynomial = endian ? 0x04c11db7 : 0xedb88320;
uint32_t c;

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
#if ENABLE_FEATURE_IPV6
int create_icmp6_socket(void)
int FAST_FUNC create_icmp6_socket(void)
{
int sock;
#if 0

View File

@@ -8,7 +8,7 @@
#include "libbb.h"
int create_icmp_socket(void)
int FAST_FUNC create_icmp_socket(void)
{
int sock;
#if 0

View File

@@ -24,7 +24,7 @@ static int i64c(int i)
return ('a' - 38 + i);
}
int crypt_make_salt(char *p, int cnt, int x)
int FAST_FUNC crypt_make_salt(char *p, int cnt, int x)
{
x += getpid() + time(NULL);
do {

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
/* try to open up the specified device */
int device_open(const char *device, int mode)
int FAST_FUNC device_open(const char *device, int mode)
{
int m, f, fd;

View File

@@ -16,7 +16,7 @@
* at the end of the username.
*/
void die_if_bad_username(const char *name)
void FAST_FUNC die_if_bad_username(const char *name)
{
goto skip; /* 1st char being dash isn't valid */
do {

View File

@@ -33,7 +33,7 @@ static const char size_conv_str[] ALIGN1 =
static const char lcc[] ALIGN1 = "diouxX";
int bb_dump_size(FS * fs)
int FAST_FUNC bb_dump_size(FS *fs)
{
FU *fu;
int bcnt, cur_size;
@@ -652,7 +652,7 @@ static void display(void)
}
}
int bb_dump_dump(char **argv)
int FAST_FUNC bb_dump_dump(char **argv)
{
FS *tfs;
@@ -674,7 +674,7 @@ int bb_dump_dump(char **argv)
return exitval;
}
void bb_dump_add(const char *fmt)
void FAST_FUNC bb_dump_add(const char *fmt)
{
const char *p;
char *p1;

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_error_msg(const char *s, ...)
void FAST_FUNC bb_error_msg(const char *s, ...)
{
va_list p;

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_error_msg_and_die(const char *s, ...)
void FAST_FUNC bb_error_msg_and_die(const char *s, ...)
{
va_list p;

View File

@@ -13,7 +13,7 @@
* return 1 if found;
* return 0 otherwise;
*/
int execable_file(const char *name)
int FAST_FUNC execable_file(const char *name)
{
struct stat s;
return (!access(name, X_OK) && !stat(name, &s) && S_ISREG(s.st_mode));
@@ -28,7 +28,7 @@ int execable_file(const char *name)
* return NULL otherwise; (PATHp is undefined)
* in all cases (*PATHp) contents will be trashed (s/:/NUL/).
*/
char *find_execable(const char *filename, char **PATHp)
char* FAST_FUNC find_execable(const char *filename, char **PATHp)
{
char *p, *n;
@@ -54,7 +54,7 @@ char *find_execable(const char *filename, char **PATHp)
* return 1 if found;
* return 0 otherwise;
*/
int exists_execable(const char *filename)
int FAST_FUNC exists_execable(const char *filename)
{
char *path = xstrdup(getenv("PATH"));
char *tmp = path;
@@ -70,7 +70,7 @@ int exists_execable(const char *filename)
#if ENABLE_FEATURE_PREFER_APPLETS
/* just like the real execvp, but try to launch an applet named 'file' first
*/
int bb_execvp(const char *file, char *const argv[])
int FAST_FUNC bb_execvp(const char *file, char *const argv[])
{
return execvp(find_applet_by_name(file) >= 0 ? bb_busybox_exec_path : file,
argv);

View File

@@ -14,7 +14,7 @@
#include "libbb.h"
int fclose_if_not_stdin(FILE *f)
int FAST_FUNC fclose_if_not_stdin(FILE *f)
{
/* Some more paranoid applets want ferror() check too */
int r = ferror(f); /* NB: does NOT set errno! */

View File

@@ -13,7 +13,7 @@
#include "libbb.h"
void fflush_stdout_and_exit(int retval)
void FAST_FUNC fflush_stdout_and_exit(int retval)
{
if (fflush(stdout))
bb_perror_msg_and_die(bb_msg_standard_output);

View File

@@ -55,12 +55,12 @@ static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string,
* including terminating string.
* Non-terminated string can be returned if EOF is reached.
* Return NULL if EOF is reached immediately. */
char *xmalloc_fgets_str(FILE *file, const char *terminating_string)
char* FAST_FUNC xmalloc_fgets_str(FILE *file, const char *terminating_string)
{
return xmalloc_fgets_internal(file, terminating_string, 0);
}
char *xmalloc_fgetline_str(FILE *file, const char *terminating_string)
char* FAST_FUNC xmalloc_fgetline_str(FILE *file, const char *terminating_string)
{
return xmalloc_fgets_internal(file, terminating_string, 1);
}

View File

@@ -17,7 +17,7 @@
* Given any other file (or directory), find the mount table entry for its
* filesystem.
*/
struct mntent *find_mount_point(const char *name, const char *table)
struct mntent* FAST_FUNC find_mount_point(const char *name, const char *table)
{
struct stat s;
dev_t mountDevice;

View File

@@ -48,7 +48,7 @@ and therefore comm field contains "exe".
* Returns a list of all matching PIDs
* It is the caller's duty to free the returned pidlist.
*/
pid_t* find_pid_by_name(const char* procName)
pid_t* FAST_FUNC find_pid_by_name(const char* procName)
{
pid_t* pidList;
int i = 0;
@@ -74,7 +74,7 @@ pid_t* find_pid_by_name(const char* procName)
return pidList;
}
pid_t *pidlist_reverse(pid_t *pidList)
pid_t* FAST_FUNC pidlist_reverse(pid_t *pidList)
{
int i = 0;
while (pidList[i])

View File

@@ -62,7 +62,7 @@ static char *find_block_device_in_dir(struct arena *ap)
return retpath;
}
char *find_block_device(const char *path)
char* FAST_FUNC find_block_device(const char *path)
{
struct arena a;

View File

@@ -14,7 +14,7 @@
* This does multiple writes as necessary.
* Returns the amount written, or -1 on an error.
*/
ssize_t full_write(int fd, const void *buf, size_t len)
ssize_t FAST_FUNC full_write(int fd, const void *buf, size_t len)
{
ssize_t cc;
ssize_t total;

View File

@@ -38,7 +38,7 @@ static int open_a_console(const char *fnam)
* if someone else used X (which does a chown on /dev/console).
*/
int get_console_fd(void)
int FAST_FUNC get_console_fd(void)
{
static const char *const console_names[] = {
DEV_CONSOLE, CURRENT_VC, CURRENT_TTY
@@ -75,7 +75,7 @@ enum {
VT_WAITACTIVE = 0x5607 /* wait for vt active */
};
void console_make_active(int fd, const int vt_num)
void FAST_FUNC console_make_active(int fd, const int vt_num)
{
xioctl(fd, VT_ACTIVATE, (void *)(ptrdiff_t)vt_num);
xioctl(fd, VT_WAITACTIVE, (void *)(ptrdiff_t)vt_num);

View File

@@ -14,7 +14,7 @@
* "abc/def" -> "def"
* "abc/def/" -> ""
*/
char *bb_get_last_path_component_nostrip(const char *path)
char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
{
char *slash = strrchr(path, '/');
@@ -30,7 +30,7 @@ char *bb_get_last_path_component_nostrip(const char *path)
* "abc/def" -> "def"
* "abc/def/" -> "def" !!
*/
char *bb_get_last_path_component_strip(char *path)
char* FAST_FUNC bb_get_last_path_component_strip(char *path)
{
char *slash = last_char_is(path, '/');

View File

@@ -16,7 +16,7 @@
* must be free'ed by the caller. If end is NULL '\n' isn't considered
* end of line. If end isn't NULL, length of the chunk read is stored in it.
* Return NULL if EOF/error */
char *bb_get_chunk_from_file(FILE *file, int *end)
char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
{
int ch;
int idx = 0;
@@ -49,7 +49,7 @@ char *bb_get_chunk_from_file(FILE *file, int *end)
}
/* Get line, including trailing \n if any */
char *xmalloc_fgets(FILE *file)
char* FAST_FUNC xmalloc_fgets(FILE *file)
{
int i;
@@ -57,7 +57,7 @@ char *xmalloc_fgets(FILE *file)
}
/* Get line. Remove trailing \n */
char *xmalloc_fgetline(FILE *file)
char* FAST_FUNC xmalloc_fgetline(FILE *file)
{
int i;
char *c = bb_get_chunk_from_file(file, &i);

View File

@@ -316,7 +316,7 @@ const char *applet_long_options;
uint32_t option_mask32;
uint32_t
uint32_t FAST_FUNC
getopt32(char **argv, const char *applet_opts, ...)
{
int argc;

View File

@@ -10,7 +10,7 @@
#define DEBUG 0
int xgetpty(char *line)
int FAST_FUNC xgetpty(char *line)
{
int p;
#if ENABLE_FEATURE_DEVPTS

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_herror_msg(const char *s, ...)
void FAST_FUNC bb_herror_msg(const char *s, ...)
{
va_list p;

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_herror_msg_and_die(const char *s, ...)
void FAST_FUNC bb_herror_msg_and_die(const char *s, ...)
{
va_list p;

View File

@@ -28,7 +28,7 @@
#include "libbb.h"
const char *make_human_readable_str(unsigned long long size,
const char* FAST_FUNC make_human_readable_str(unsigned long long size,
unsigned long block_size, unsigned long display_unit)
{
/* The code will adjust for additional (appended) units */

View File

@@ -11,7 +11,7 @@
#include "libbb.h"
#include "inet_common.h"
int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
int FAST_FUNC INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
{
struct hostent *hp;
#if ENABLE_FEATURE_ETC_NETWORKS
@@ -81,7 +81,7 @@ int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirst)
* & 0x4000: host instead of net,
* & 0x0fff: don't resolve
*/
char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
char* FAST_FUNC INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
{
/* addr-to-name cache */
struct addr {
@@ -165,7 +165,7 @@ char *INET_rresolve(struct sockaddr_in *s_in, int numeric, uint32_t netmask)
#if ENABLE_FEATURE_IPV6
int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
int FAST_FUNC INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
{
struct addrinfo req, *ai;
int s;
@@ -189,7 +189,7 @@ int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
#endif
char *INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
char* FAST_FUNC INET6_rresolve(struct sockaddr_in6 *sin6, int numeric)
{
char name[128];
int s;

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
#include <syslog.h>
void bb_info_msg(const char *s, ...)
void FAST_FUNC bb_info_msg(const char *s, ...)
{
va_list p;
/* va_copy is used because it is not portable

View File

@@ -27,7 +27,7 @@ static ino_dev_hashtable_bucket_t **ino_dev_hashtable;
* Return name if statbuf->st_ino && statbuf->st_dev are recorded in
* ino_dev_hashtable, else return NULL
*/
char *is_in_ino_dev_hashtable(const struct stat *statbuf)
char* FAST_FUNC is_in_ino_dev_hashtable(const struct stat *statbuf)
{
ino_dev_hashtable_bucket_t *bucket;
@@ -47,7 +47,7 @@ char *is_in_ino_dev_hashtable(const struct stat *statbuf)
}
/* Add statbuf to statbuf hash table */
void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
void FAST_FUNC add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
{
int i;
ino_dev_hashtable_bucket_t *bucket;
@@ -69,7 +69,7 @@ void add_to_ino_dev_hashtable(const struct stat *statbuf, const char *name)
#if ENABLE_FEATURE_CLEAN_UP
/* Clear statbuf hash table */
void reset_ino_dev_hashtable(void)
void FAST_FUNC reset_ino_dev_hashtable(void)
{
int i;
ino_dev_hashtable_bucket_t *bucket;

View File

@@ -15,7 +15,7 @@
* Return TRUE if fileName is a directory.
* Nonexistent files return FALSE.
*/
int is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
int FAST_FUNC is_directory(const char *fileName, const int followLinks, struct stat *statBuf)
{
int status;
struct stat astatBuf;

View File

@@ -16,7 +16,7 @@
*
* if (get_linux_version_code() > KERNEL_VERSION(2,2,11)) { <stuff> }
*/
int get_linux_version_code(void)
int FAST_FUNC get_linux_version_code(void)
{
struct utsname name;
char *s;

View File

@@ -12,7 +12,7 @@
/* Find out if the last character of a string matches the one given.
* Don't underrun the buffer if the string length is 0.
*/
char* last_char_is(const char *s, int c)
char* FAST_FUNC last_char_is(const char *s, int c)
{
if (s && *s) {
size_t sz = strlen(s) - 1;

View File

@@ -1352,7 +1352,7 @@ static void win_changed(int nsig)
* 0 on ctrl-C (the line entered is still returned in 'command'),
* >0 length of input string, including terminating '\n'
*/
int read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, line_input_t *st)
{
#if ENABLE_FEATURE_TAB_COMPLETION
smallint lastWasTab = FALSE;
@@ -1845,7 +1845,7 @@ int read_line_input(const char *prompt, char *command, int maxsize, line_input_t
return command_len;
}
line_input_t *new_line_input_t(int flags)
line_input_t* FAST_FUNC new_line_input_t(int flags)
{
line_input_t *n = xzalloc(sizeof(*n));
n->flags = flags;
@@ -1855,7 +1855,7 @@ line_input_t *new_line_input_t(int flags)
#else
#undef read_line_input
int read_line_input(const char* prompt, char* command, int maxsize)
int FAST_FUNC read_line_input(const char* prompt, char* command, int maxsize)
{
fputs(prompt, stdout);
fflush(stdout);

View File

@@ -13,7 +13,7 @@
#include "libbb.h"
/* Add data to the start of the linked list. */
void llist_add_to(llist_t **old_head, void *data)
void FAST_FUNC llist_add_to(llist_t **old_head, void *data)
{
llist_t *new_head = xmalloc(sizeof(llist_t));
@@ -23,7 +23,7 @@ void llist_add_to(llist_t **old_head, void *data)
}
/* Add data to the end of the linked list. */
void llist_add_to_end(llist_t **list_head, void *data)
void FAST_FUNC llist_add_to_end(llist_t **list_head, void *data)
{
llist_t *new_item = xmalloc(sizeof(llist_t));
@@ -42,7 +42,7 @@ void llist_add_to_end(llist_t **list_head, void *data)
}
/* Remove first element from the list and return it */
void *llist_pop(llist_t **head)
void* FAST_FUNC llist_pop(llist_t **head)
{
void *data, *next;
@@ -58,7 +58,7 @@ void *llist_pop(llist_t **head)
}
/* Unlink arbitrary given element from the list */
void llist_unlink(llist_t **head, llist_t *elm)
void FAST_FUNC llist_unlink(llist_t **head, llist_t *elm)
{
llist_t *crt;
@@ -80,7 +80,7 @@ void llist_unlink(llist_t **head, llist_t *elm)
/* Recursively free all elements in the linked list. If freeit != NULL
* call it on each datum in the list */
void llist_free(llist_t *elm, void (*freeit) (void *data))
void FAST_FUNC llist_free(llist_t *elm, void (*freeit) (void *data))
{
while (elm) {
void *data = llist_pop(&elm);
@@ -92,7 +92,7 @@ void llist_free(llist_t *elm, void (*freeit) (void *data))
#ifdef UNUSED
/* Reverse list order. */
llist_t *llist_rev(llist_t *list)
llist_t* FAST_FUNC llist_rev(llist_t *list)
{
llist_t *rev = NULL;

View File

@@ -18,7 +18,7 @@
static const char fmtstr_d[] ALIGN1 = "%A, %d %B %Y";
static const char fmtstr_t[] ALIGN1 = "%H:%M:%S";
void print_login_issue(const char *issue_file, const char *tty)
void FAST_FUNC print_login_issue(const char *issue_file, const char *tty)
{
FILE *fd;
int c;
@@ -86,7 +86,7 @@ void print_login_issue(const char *issue_file, const char *tty)
fflush(stdout);
}
void print_login_prompt(void)
void FAST_FUNC print_login_prompt(void)
{
char *hostname = safe_gethostname();
@@ -112,7 +112,7 @@ static const char forbid[] ALIGN1 =
"LD_NOWARN" "\0"
"LD_KEEPDIR" "\0";
int sanitize_env_if_suid(void)
int FAST_FUNC sanitize_env_if_suid(void)
{
const char *p;

View File

@@ -44,7 +44,7 @@ typedef struct {
} bb_loop_info;
#endif
char *query_loop(const char *device)
char* FAST_FUNC query_loop(const char *device)
{
int fd;
bb_loop_info loopinfo;
@@ -61,7 +61,7 @@ char *query_loop(const char *device)
}
int del_loop(const char *device)
int FAST_FUNC del_loop(const char *device)
{
int fd, rc;
@@ -79,7 +79,7 @@ int del_loop(const char *device)
search will re-use an existing loop device already bound to that
file/offset if it finds one.
*/
int set_loop(char **device, const char *file, unsigned long long offset)
int FAST_FUNC set_loop(char **device, const char *file, unsigned long long offset)
{
char dev[LOOP_NAMESIZE];
char *try;

View File

@@ -26,7 +26,7 @@
/* This function is used from NOFORK applets. It must not allocate anything */
int bb_make_directory (char *path, long mode, int flags)
int FAST_FUNC bb_make_directory(char *path, long mode, int flags)
{
mode_t mask;
const char *fail_msg;

View File

@@ -12,7 +12,7 @@
#include "libbb.h"
int match_fstype(const struct mntent *mt, const char *fstype)
int FAST_FUNC match_fstype(const struct mntent *mt, const char *fstype)
{
int no = 0;
int len;

View File

@@ -24,7 +24,7 @@
/* Initialize structure containing state of computation.
* (RFC 1321, 3.3: Step 3)
*/
void md5_begin(md5_ctx_t *ctx)
void FAST_FUNC md5_begin(md5_ctx_t *ctx)
{
ctx->A = 0x67452301;
ctx->B = 0xefcdab89;
@@ -371,7 +371,7 @@ static void md5_hash_block(const void *buffer, md5_ctx_t *ctx)
* This function's internal buffer remembers previous data until it has 64
* bytes worth to pass on. Call md5_end() to flush this buffer. */
void md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
void FAST_FUNC md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
{
char *buf=(char *)buffer;
@@ -410,7 +410,7 @@ void md5_hash(const void *buffer, size_t len, md5_ctx_t *ctx)
* IMPORTANT: On some systems it is required that RESBUF is correctly
* aligned for a 32 bits value.
*/
void *md5_end(void *resbuf, md5_ctx_t *ctx)
void* FAST_FUNC md5_end(void *resbuf, md5_ctx_t *ctx)
{
char *buf = ctx->buffer;
int i;

View File

@@ -51,7 +51,7 @@ static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
/* 0123456789abcdef */
static const char mode_chars[7] ALIGN1 = "rwxSTst";
const char *bb_mode_string(mode_t mode)
const char* FAST_FUNC bb_mode_string(mode_t mode)
{
static char buf[12];
char *p = buf;
@@ -91,7 +91,7 @@ static const char type_chars[16] = "?pc?d?b?-?l?s???";
/* 0123456789abcdef */
static const char mode_chars[7] = "rwxSTst";
const char *bb_mode_string(mode_t mode)
const char* FAST_FUNC bb_mode_string(mode_t mode)
{
static char buf[12];
char *p = buf;

View File

@@ -11,7 +11,7 @@
#include "libbb.h"
#if ENABLE_FEATURE_MTAB_SUPPORT
void erase_mtab(const char *name)
void FAST_FUNC erase_mtab(const char *name)
{
struct mntent *entries = NULL;
int i, count = 0;

View File

@@ -157,7 +157,7 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
return NULL;
}
int obscure(const char *old, const char *newval, const struct passwd *pw)
int FAST_FUNC obscure(const char *old, const char *newval, const struct passwd *pw)
{
const char *msg;

View File

@@ -15,7 +15,7 @@
#define FILEMODEBITS (S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO)
int bb_parse_mode(const char *s, mode_t *current_mode)
int FAST_FUNC bb_parse_mode(const char *s, mode_t *current_mode)
{
static const mode_t who_mask[] = {
S_ISUID | S_ISGID | S_ISVTX | S_IRWXU | S_IRWXG | S_IRWXO, /* a */

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_perror_msg(const char *s, ...)
void FAST_FUNC bb_perror_msg(const char *s, ...)
{
va_list p;
@@ -19,7 +19,7 @@ void bb_perror_msg(const char *s, ...)
va_end(p);
}
void bb_simple_perror_msg(const char *s)
void FAST_FUNC bb_simple_perror_msg(const char *s)
{
bb_perror_msg("%s", s);
}

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_perror_msg_and_die(const char *s, ...)
void FAST_FUNC bb_perror_msg_and_die(const char *s, ...)
{
va_list p;
@@ -20,7 +20,7 @@ void bb_perror_msg_and_die(const char *s, ...)
xfunc_die();
}
void bb_simple_perror_msg_and_die(const char *s)
void FAST_FUNC bb_simple_perror_msg_and_die(const char *s)
{
bb_perror_msg_and_die("%s", s);
}

View File

@@ -11,11 +11,12 @@
* modified definition without "attribute (format)"
* instead of including libbb.h */
//#include "libbb.h"
extern void bb_perror_msg(const char *s, ...);
#include "platform.h"
extern void bb_perror_msg(const char *s, ...) FAST_FUNC;
/* suppress gcc "no previous prototype" warning */
void bb_perror_nomsg(void);
void bb_perror_nomsg(void)
void FAST_FUNC bb_perror_nomsg(void);
void FAST_FUNC bb_perror_nomsg(void)
{
bb_perror_msg(0);
}

View File

@@ -11,11 +11,12 @@
* modified definition without "attribute (format)"
* instead of including libbb.h */
//#include "libbb.h"
extern void bb_perror_msg_and_die(const char *s, ...);
#include "platform.h"
extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC;
/* suppress gcc "no previous prototype" warning */
void bb_perror_nomsg_and_die(void);
void bb_perror_nomsg_and_die(void)
void FAST_FUNC bb_perror_nomsg_and_die(void);
void FAST_FUNC bb_perror_nomsg_and_die(void)
{
bb_perror_msg_and_die(0);
}

View File

@@ -13,7 +13,7 @@
smallint wrote_pidfile;
void write_pidfile(const char *path)
void FAST_FUNC write_pidfile(const char *path)
{
int pid_fd;
char *end;

View File

@@ -9,7 +9,7 @@
#include <libbb.h>
/* returns a set with the flags not printed */
int print_flags_separated(const int *masks, const char *labels, int flags, const char *separator)
int FAST_FUNC print_flags_separated(const int *masks, const char *labels, int flags, const char *separator)
{
const char *need_separator = NULL;
while (*labels) {
@@ -19,14 +19,14 @@ int print_flags_separated(const int *masks, const char *labels, int flags, const
labels);
need_separator = separator;
flags &= ~ *masks;
masks++;
}
masks++;
labels += strlen(labels) + 1;
}
return flags;
}
int print_flags(const masks_labels_t *ml, int flags)
int FAST_FUNC print_flags(const masks_labels_t *ml, int flags)
{
return print_flags_separated(ml->masks, ml->labels, flags, NULL);
}

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void fputc_printable(int ch, FILE *file)
void FAST_FUNC fputc_printable(int ch, FILE *file)
{
if ((ch & (0x80 + PRINTABLE_META)) == (0x80 + PRINTABLE_META)) {
fputs("M-", file);

View File

@@ -16,7 +16,7 @@
#undef _tolower
#define _tolower(X) ((X)|((char) 0x20))
char bb_process_escape_sequence(const char **ptr)
char FAST_FUNC bb_process_escape_sequence(const char **ptr)
{
static const char charmap[] ALIGN1 = {
'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', 0,

View File

@@ -30,7 +30,7 @@ static void clear_cache(cache_t *cp)
cp->cache = NULL;
cp->size = 0;
}
void clear_username_cache(void)
void FAST_FUNC clear_username_cache(void)
{
clear_cache(&username);
clear_cache(&groupname);
@@ -52,7 +52,7 @@ static int get_cached(cache_t *cp, unsigned id)
}
#endif
typedef char* ug_func(char *name, int bufsize, long uid);
typedef char* FAST_FUNC ug_func(char *name, int bufsize, long uid);
static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
{
int i;
@@ -66,11 +66,11 @@ static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
fp(cp->cache[i].name, sizeof(cp->cache[i].name), id);
return cp->cache[i].name;
}
const char* get_cached_username(uid_t uid)
const char* FAST_FUNC get_cached_username(uid_t uid)
{
return get_cached(&username, uid, bb_getpwuid);
}
const char* get_cached_groupname(gid_t gid)
const char* FAST_FUNC get_cached_groupname(gid_t gid)
{
return get_cached(&groupname, gid, bb_getgrgid);
}
@@ -78,7 +78,7 @@ const char* get_cached_groupname(gid_t gid)
#define PROCPS_BUFSIZE 1024
static int read_to_buf(const char *filename, void *buf)
static int FAST_FUNC read_to_buf(const char *filename, void *buf)
{
int fd;
/* open_read_close() would do two reads, checking for EOF.
@@ -93,7 +93,7 @@ static int read_to_buf(const char *filename, void *buf)
return ret;
}
static procps_status_t *alloc_procps_scan(void)
static procps_status_t* FAST_FUNC alloc_procps_scan(void)
{
unsigned n = getpagesize();
procps_status_t* sp = xzalloc(sizeof(procps_status_t));
@@ -107,7 +107,7 @@ static procps_status_t *alloc_procps_scan(void)
return sp;
}
void free_procps_scan(procps_status_t* sp)
void FAST_FUNC free_procps_scan(procps_status_t* sp)
{
closedir(sp->dir);
free(sp->argv0);
@@ -163,7 +163,7 @@ static char *skip_fields(char *str, int count)
#endif
void BUG_comm_size(void);
procps_status_t *procps_scan(procps_status_t* sp, int flags)
procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
{
struct dirent *entry;
char buf[PROCPS_BUFSIZE];
@@ -402,7 +402,7 @@ procps_status_t *procps_scan(procps_status_t* sp, int flags)
return sp;
}
void read_cmdline(char *buf, int col, unsigned pid, const char *comm)
void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
{
ssize_t sz;
char filename[sizeof("/proc//cmdline") + sizeof(int)*3];

View File

@@ -50,7 +50,7 @@ static void my_crypt_cleanup(void)
des_ctx = NULL;
}
char *pw_encrypt(const char *clear, const char *salt, int cleanup)
char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
{
char *encrypted;
@@ -70,7 +70,7 @@ char *pw_encrypt(const char *clear, const char *salt, int cleanup)
#else /* if !ENABLE_USE_BB_CRYPT */
char *pw_encrypt(const char *clear, const char *salt, int cleanup)
char* FAST_FUNC pw_encrypt(const char *clear, const char *salt, int cleanup)
{
#if 0 /* was CONFIG_FEATURE_SHA1_PASSWORDS, but there is no such thing??? */
if (strncmp(salt, "$2$", 3) == 0) {

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
ssize_t safe_read(int fd, void *buf, size_t count)
ssize_t FAST_FUNC safe_read(int fd, void *buf, size_t count)
{
ssize_t n;
@@ -56,7 +56,7 @@ ssize_t safe_read(int fd, void *buf, size_t count)
* which detects EAGAIN and uses poll() to wait on the fd.
* Thankfully, poll() doesn't care about O_NONBLOCK flag.
*/
ssize_t nonblock_safe_read(int fd, void *buf, size_t count)
ssize_t FAST_FUNC nonblock_safe_read(int fd, void *buf, size_t count)
{
struct pollfd pfd[1];
ssize_t n;
@@ -78,7 +78,7 @@ ssize_t nonblock_safe_read(int fd, void *buf, size_t count)
* Returns the amount read, or -1 on an error.
* A short read is returned on an end of file.
*/
ssize_t full_read(int fd, void *buf, size_t len)
ssize_t FAST_FUNC full_read(int fd, void *buf, size_t len)
{
ssize_t cc;
ssize_t total;
@@ -107,7 +107,7 @@ ssize_t full_read(int fd, void *buf, size_t len)
}
// Die with an error message if we can't read the entire buffer.
void xread(int fd, void *buf, size_t count)
void FAST_FUNC xread(int fd, void *buf, size_t count)
{
if (count) {
ssize_t size = full_read(fd, buf, count);
@@ -117,7 +117,7 @@ void xread(int fd, void *buf, size_t count)
}
// Die with an error message if we can't read one character.
unsigned char xread_char(int fd)
unsigned char FAST_FUNC xread_char(int fd)
{
char tmp;
xread(fd, &tmp, 1);
@@ -125,7 +125,7 @@ unsigned char xread_char(int fd)
}
// Read one line a-la fgets. Works only on seekable streams
char *reads(int fd, char *buffer, size_t size)
char* FAST_FUNC reads(int fd, char *buffer, size_t size)
{
char *p;
@@ -152,7 +152,7 @@ char *reads(int fd, char *buffer, size_t size)
// Reads one line a-la fgets (but doesn't save terminating '\n').
// Reads byte-by-byte. Useful when it is important to not read ahead.
// Bytes are appended to pfx (which must be malloced, or NULL).
char *xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
char* FAST_FUNC xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
{
char *p;
size_t sz = buf ? strlen(buf) : 0;
@@ -185,7 +185,7 @@ char *xmalloc_reads(int fd, char *buf, size_t *maxsz_p)
return xrealloc(buf, p - buf);
}
ssize_t read_close(int fd, void *buf, size_t size)
ssize_t FAST_FUNC read_close(int fd, void *buf, size_t size)
{
/*int e;*/
size = full_read(fd, buf, size);
@@ -195,7 +195,7 @@ ssize_t read_close(int fd, void *buf, size_t size)
return size;
}
ssize_t open_read_close(const char *filename, void *buf, size_t size)
ssize_t FAST_FUNC open_read_close(const char *filename, void *buf, size_t size)
{
int fd = open(filename, O_RDONLY);
if (fd < 0)
@@ -205,7 +205,7 @@ ssize_t open_read_close(const char *filename, void *buf, size_t size)
// Read (potentially big) files in one go. File size is estimated
// by stat.
void *xmalloc_open_read_close(const char *filename, size_t *sizep)
void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *sizep)
{
char *buf;
size_t size;
@@ -247,7 +247,7 @@ void *xmalloc_open_read_close(const char *filename, size_t *sizep)
// Read (potentially big) files in one go. File size is estimated by
// lseek to end.
void *xmalloc_open_read_close(const char *filename, size_t *sizep)
void* FAST_FUNC xmalloc_open_read_close(const char *filename, size_t *sizep)
{
char *buf;
size_t size;
@@ -284,7 +284,7 @@ void *xmalloc_open_read_close(const char *filename, size_t *sizep)
}
#endif
void *xmalloc_xopen_read_close(const char *filename, size_t *sizep)
void* FAST_FUNC xmalloc_xopen_read_close(const char *filename, size_t *sizep)
{
void *buf = xmalloc_open_read_close(filename, sizep);
if (!buf)

View File

@@ -22,7 +22,7 @@
* is so stinking huge.
*/
static int true_action(const char *fileName ATTRIBUTE_UNUSED,
static int FAST_FUNC true_action(const char *fileName ATTRIBUTE_UNUSED,
struct stat *statbuf ATTRIBUTE_UNUSED,
void* userData ATTRIBUTE_UNUSED,
int depth ATTRIBUTE_UNUSED)
@@ -53,10 +53,10 @@ static int true_action(const char *fileName ATTRIBUTE_UNUSED,
* 1: stat(statbuf). Calls dirAction and optionally recurse on link to dir.
*/
int recursive_action(const char *fileName,
int FAST_FUNC recursive_action(const char *fileName,
unsigned flags,
int (*fileAction)(const char *fileName, struct stat *statbuf, void* userData, int depth),
int (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth),
int FAST_FUNC (*fileAction)(const char *fileName, struct stat *statbuf, void* userData, int depth),
int FAST_FUNC (*dirAction)(const char *fileName, struct stat *statbuf, void* userData, int depth),
void* userData,
unsigned depth)
{

View File

@@ -11,7 +11,7 @@
/* Used from NOFORK applets. Must not allocate anything */
int remove_file(const char *path, int flags)
int FAST_FUNC remove_file(const char *path, int flags)
{
struct stat path_stat;

View File

@@ -32,7 +32,7 @@
/* Return 1 if SHELL is a restricted shell (one not returned by
getusershell), else 0, meaning it is a standard shell. */
int restricted_shell(const char *shell)
int FAST_FUNC restricted_shell(const char *shell)
{
char *line;

View File

@@ -11,7 +11,7 @@
# define ADJTIME_PATH "/etc/adjtime"
#endif
int rtc_adjtime_is_utc(void)
int FAST_FUNC rtc_adjtime_is_utc(void)
{
int utc = 0;
FILE *f = fopen(ADJTIME_PATH, "r");
@@ -40,7 +40,7 @@ int rtc_adjtime_is_utc(void)
return utc;
}
int rtc_xopen(const char **default_rtc, int flags)
int FAST_FUNC rtc_xopen(const char **default_rtc, int flags)
{
int rtc;
@@ -59,7 +59,7 @@ int rtc_xopen(const char **default_rtc, int flags)
return xopen(*default_rtc, flags);
}
time_t rtc_read_time(int fd, int utc)
time_t FAST_FUNC rtc_read_time(int fd, int utc)
{
struct tm tm;
char *oldtz = 0;

View File

@@ -36,14 +36,12 @@
#if ENABLE_SELINUX
static security_context_t current_sid;
void
renew_current_security_context(void)
void FAST_FUNC renew_current_security_context(void)
{
freecon(current_sid); /* Release old context */
getcon(&current_sid); /* update */
}
void
set_current_security_context(security_context_t sid)
void FAST_FUNC set_current_security_context(security_context_t sid)
{
freecon(current_sid); /* Release old context */
current_sid = sid;
@@ -56,7 +54,7 @@ set_current_security_context(security_context_t sid)
If ADDITIONAL_ARGS is nonzero, pass it to the shell as more
arguments. */
void run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
void FAST_FUNC run_shell(const char *shell, int loginshell, const char *command, const char **additional_args)
{
const char **args;
int argno = 1;

View File

@@ -33,7 +33,7 @@
* This is an illegal first character for a hostname.
* The returned malloced string must be freed by the caller.
*/
char *safe_gethostname(void)
char* FAST_FUNC safe_gethostname(void)
{
struct utsname uts;

View File

@@ -12,7 +12,7 @@
/* Wrapper which restarts poll on EINTR or ENOMEM.
* On other errors does perror("poll") and returns.
* Warning! May take longer than timeout_ms to return! */
int safe_poll(struct pollfd *ufds, nfds_t nfds, int timeout)
int FAST_FUNC safe_poll(struct pollfd *ufds, nfds_t nfds, int timeout)
{
while (1) {
int n = poll(ufds, nfds, timeout);

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
/* Like strncpy but make sure the resulting string is always 0 terminated. */
char *safe_strncpy(char *dst, const char *src, size_t size)
char* FAST_FUNC safe_strncpy(char *dst, const char *src, size_t size)
{
if (!size) return dst;
dst[--size] = '\0';

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
ssize_t safe_write(int fd, const void *buf, size_t count)
ssize_t FAST_FUNC safe_write(int fd, const void *buf, size_t count)
{
ssize_t n;

View File

@@ -7,7 +7,7 @@
#include "libbb.h"
#include <selinux/context.h>
context_t set_security_context_component(security_context_t cur_context,
context_t FAST_FUNC set_security_context_component(security_context_t cur_context,
char *user, char *role, char *type, char *range)
{
context_t con = context_new(cur_context);
@@ -29,7 +29,7 @@ error:
return NULL;
}
void setfscreatecon_or_die(security_context_t scontext)
void FAST_FUNC setfscreatecon_or_die(security_context_t scontext)
{
if (setfscreatecon(scontext) < 0) {
/* Can be NULL. All known printf implementations
@@ -39,7 +39,7 @@ void setfscreatecon_or_die(security_context_t scontext)
}
}
void selinux_preserve_fcontext(int fdesc)
void FAST_FUNC selinux_preserve_fcontext(int fdesc)
{
security_context_t context;

View File

@@ -30,7 +30,7 @@
#include "libbb.h"
void setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
void FAST_FUNC setup_environment(const char *shell, int clear_env, int change_env, const struct passwd *pw)
{
if (clear_env) {
const char *term;

View File

@@ -83,7 +83,7 @@ static void sha1_compile(sha1_ctx_t *ctx)
ctx->hash[4] += e;
}
void sha1_begin(sha1_ctx_t *ctx)
void FAST_FUNC sha1_begin(sha1_ctx_t *ctx)
{
ctx->count[0] = ctx->count[1] = 0;
ctx->hash[0] = 0x67452301;
@@ -95,7 +95,7 @@ void sha1_begin(sha1_ctx_t *ctx)
/* SHA1 hash data in an array of bytes into hash buffer and call the */
/* hash_compile function as required. */
void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx)
void FAST_FUNC sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx)
{
uint32_t pos = (uint32_t) (ctx->count[0] & SHA1_MASK);
uint32_t freeb = SHA1_BLOCK_SIZE - pos;
@@ -116,7 +116,7 @@ void sha1_hash(const void *data, size_t length, sha1_ctx_t *ctx)
memcpy(((unsigned char *) ctx->wbuf) + pos, sp, length);
}
void *sha1_end(void *resbuf, sha1_ctx_t *ctx)
void* FAST_FUNC sha1_end(void *resbuf, sha1_ctx_t *ctx)
{
/* SHA1 Final padding and digest calculation */
#if BB_BIG_ENDIAN

View File

@@ -12,19 +12,19 @@
#include "libbb.h"
/* Saves 2 bytes on x86! Oh my... */
int sigaction_set(int signum, const struct sigaction *act)
int FAST_FUNC sigaction_set(int signum, const struct sigaction *act)
{
return sigaction(signum, act, NULL);
}
int sigprocmask_allsigs(int how)
int FAST_FUNC sigprocmask_allsigs(int how)
{
sigset_t set;
sigfillset(&set);
return sigprocmask(how, &set, NULL);
}
void bb_signals(int sigs, void (*f)(int))
void FAST_FUNC bb_signals(int sigs, void (*f)(int))
{
int sig_no = 0;
int bit = 1;
@@ -39,7 +39,7 @@ void bb_signals(int sigs, void (*f)(int))
}
}
void bb_signals_recursive(int sigs, void (*f)(int))
void FAST_FUNC bb_signals_recursive(int sigs, void (*f)(int))
{
int sig_no = 0;
int bit = 1;
@@ -60,7 +60,7 @@ void bb_signals_recursive(int sigs, void (*f)(int))
}
}
void sig_block(int sig)
void FAST_FUNC sig_block(int sig)
{
sigset_t ss;
sigemptyset(&ss);
@@ -68,7 +68,7 @@ void sig_block(int sig)
sigprocmask(SIG_BLOCK, &ss, NULL);
}
void sig_unblock(int sig)
void FAST_FUNC sig_unblock(int sig)
{
sigset_t ss;
sigemptyset(&ss);
@@ -76,7 +76,7 @@ void sig_unblock(int sig)
sigprocmask(SIG_UNBLOCK, &ss, NULL);
}
void wait_for_any_sig(void)
void FAST_FUNC wait_for_any_sig(void)
{
sigset_t ss;
sigemptyset(&ss);
@@ -84,7 +84,7 @@ void wait_for_any_sig(void)
}
/* Assuming the sig is fatal */
void kill_myself_with_sig(int sig)
void FAST_FUNC kill_myself_with_sig(int sig)
{
signal(sig, SIG_DFL);
sig_unblock(sig);
@@ -92,7 +92,7 @@ void kill_myself_with_sig(int sig)
_exit(EXIT_FAILURE); /* Should not reach it */
}
void signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))
void FAST_FUNC signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))
{
struct sigaction sa;
memset(&sa, 0, sizeof(sa));
@@ -102,7 +102,7 @@ void signal_SA_RESTART_empty_mask(int sig, void (*handler)(int))
sigaction_set(sig, &sa);
}
void signal_no_SA_RESTART_empty_mask(int sig, void (*handler)(int))
void FAST_FUNC signal_no_SA_RESTART_empty_mask(int sig, void (*handler)(int))
{
struct sigaction sa;
memset(&sa, 0, sizeof(sa));

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
char *bb_simplify_path(const char *path)
char* FAST_FUNC bb_simplify_path(const char *path)
{
char *s, *start, *p;

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
char *skip_whitespace(const char *s)
char* FAST_FUNC skip_whitespace(const char *s)
{
/* NB: isspace('\0') returns 0 */
while (isspace(*s)) ++s;
@@ -17,7 +17,7 @@ char *skip_whitespace(const char *s)
return (char *) s;
}
char *skip_non_whitespace(const char *s)
char* FAST_FUNC skip_non_whitespace(const char *s)
{
while (*s && !isspace(*s)) ++s;

View File

@@ -56,7 +56,7 @@ static const struct speed_map speeds[] = {
enum { NUM_SPEEDS = ARRAY_SIZE(speeds) };
unsigned int tty_baud_to_value(speed_t speed)
unsigned FAST_FUNC tty_baud_to_value(speed_t speed)
{
int i = 0;
@@ -72,7 +72,7 @@ unsigned int tty_baud_to_value(speed_t speed)
return 0;
}
speed_t tty_value_to_baud(unsigned int value)
speed_t FAST_FUNC tty_value_to_baud(unsigned int value)
{
int i = 0;

View File

@@ -4,7 +4,8 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
char* str_tolower(char *str)
char* FAST_FUNC str_tolower(char *str)
{
char *c;
for (c = str; *c; ++c)

View File

@@ -19,7 +19,7 @@
* The strrstr() function finds the last occurrence of the substring needle
* in the string haystack. The terminating nul characters are not compared.
*/
char* strrstr(const char *haystack, const char *needle)
char* FAST_FUNC strrstr(const char *haystack, const char *needle)
{
char *r = NULL;

View File

@@ -20,14 +20,14 @@
/* libc has incredibly messy way of doing this,
* typically requiring -lrt. We just skip all this mess */
unsigned long long monotonic_us(void)
unsigned long long FAST_FUNC monotonic_us(void)
{
struct timespec ts;
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts))
bb_error_msg_and_die("clock_gettime(MONOTONIC) failed");
return ts.tv_sec * 1000000ULL + ts.tv_nsec/1000;
}
unsigned monotonic_sec(void)
unsigned FAST_FUNC monotonic_sec(void)
{
struct timespec ts;
if (syscall(__NR_clock_gettime, CLOCK_MONOTONIC, &ts))
@@ -35,14 +35,14 @@ unsigned monotonic_sec(void)
return ts.tv_sec;
}
#else
unsigned long long monotonic_us(void)
unsigned long long FAST_FUNC monotonic_us(void)
{
struct timeval tv;
gettimeofday(&tv, NULL);
return tv.tv_sec * 1000000ULL + tv.tv_usec;
}
unsigned monotonic_sec(void)
unsigned FAST_FUNC monotonic_sec(void)
{
return time(NULL);
}

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
void trim(char *s)
void FAST_FUNC trim(char *s)
{
size_t len = strlen(s);
size_t lws;

View File

@@ -121,7 +121,7 @@ static const char signals[][7] = {
// Convert signal name to number.
int get_signum(const char *name)
int FAST_FUNC get_signum(const char *name)
{
unsigned i;
@@ -155,7 +155,7 @@ int get_signum(const char *name)
// Convert signal number to name
const char *get_signame(int number)
const char* FAST_FUNC get_signame(int number)
{
if ((unsigned)number < ARRAY_SIZE(signals)) {
if (signals[number][0]) /* if it's not an empty str */
@@ -168,7 +168,7 @@ const char *get_signame(int number)
// Print the whole signal list
void print_signames(void)
void FAST_FUNC print_signames(void)
{
unsigned signo;

View File

@@ -13,7 +13,7 @@
* This asks kernel to let us know dst addr/port of incoming packets
* We don't check for errors here. Not supported == won't be used
*/
void
void FAST_FUNC
socket_want_pktinfo(int fd)
{
#ifdef IP_PKTINFO
@@ -25,7 +25,7 @@ socket_want_pktinfo(int fd)
}
ssize_t
ssize_t FAST_FUNC
send_to_from(int fd, void *buf, size_t len, int flags,
const struct sockaddr *to,
const struct sockaddr *from,
@@ -100,7 +100,7 @@ send_to_from(int fd, void *buf, size_t len, int flags,
* _Only_ IP/IPv6 address part of 'to' is _maybe_ modified.
* Typical usage is to preinit 'to' with "default" value
* before calling recv_from_to(). */
ssize_t
ssize_t FAST_FUNC
recv_from_to(int fd, void *buf, size_t len, int flags,
struct sockaddr *from, struct sockaddr *to,
socklen_t sa_size)

View File

@@ -36,7 +36,7 @@ static void check_selinux_update_passwd(const char *username)
#define check_selinux_update_passwd(username) ((void)0)
#endif
int update_passwd(const char *filename, const char *username,
int FAST_FUNC update_passwd(const char *filename, const char *username,
const char *new_pw)
{
struct stat sb;

View File

@@ -39,7 +39,7 @@ const char bb_uuenc_tbl_std[65] ALIGN1 = {
* buffer of at least 1+BASE64_LENGTH(length) bytes.
* where BASE64_LENGTH(len) = (4 * ((LENGTH + 2) / 3))
*/
void bb_uuencode(char *p, const void *src, int length, const char *tbl)
void FAST_FUNC bb_uuencode(char *p, const void *src, int length, const char *tbl)
{
const unsigned char *s = src;

View File

@@ -10,7 +10,7 @@
#include "libbb.h"
#if defined(__GLIBC__) && __GLIBC__ < 2
int vdprintf(int d, const char *format, va_list ap)
int FAST_FUNC vdprintf(int d, const char *format, va_list ap)
{
char buf[BUF_SIZE];
int len;

View File

@@ -13,7 +13,7 @@
smallint logmode = LOGMODE_STDIO;
const char *msg_eol = "\n";
void bb_verror_msg(const char *s, va_list p, const char* strerr)
void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
{
char *msg;
int applet_len, strerr_len, msgeol_len, used;
@@ -70,7 +70,7 @@ void bb_verror_msg(const char *s, va_list p, const char* strerr)
/* Code size is approximately the same, but currently it's the only user
* of writev in entire bbox. __libc_writev in uclibc is ~50 bytes. */
void bb_verror_msg(const char *s, va_list p, const char* strerr)
void FAST_FUNC bb_verror_msg(const char *s, va_list p, const char* strerr)
{
int strerr_len, msgeol_len;
struct iovec iov[3];

View File

@@ -20,7 +20,7 @@
/* This does a fork/exec in one call, using vfork(). Returns PID of new child,
* -1 for failure. Runs argv[0], searching path if that has no / in it. */
pid_t spawn(char **argv)
pid_t FAST_FUNC spawn(char **argv)
{
/* Compiler should not optimize stores here */
volatile int failed;
@@ -58,7 +58,7 @@ pid_t spawn(char **argv)
}
/* Die with an error message if we can't spawn a child process. */
pid_t xspawn(char **argv)
pid_t FAST_FUNC xspawn(char **argv)
{
pid_t pid = spawn(argv);
if (pid < 0)
@@ -66,7 +66,7 @@ pid_t xspawn(char **argv)
return pid;
}
int safe_waitpid(int pid, int *wstat, int options)
int FAST_FUNC safe_waitpid(int pid, int *wstat, int options)
{
int r;
@@ -76,13 +76,13 @@ int safe_waitpid(int pid, int *wstat, int options)
return r;
}
int wait_any_nohang(int *wstat)
int FAST_FUNC wait_any_nohang(int *wstat)
{
return safe_waitpid(-1, wstat, WNOHANG);
}
// Wait for the specified child PID to exit, returning child's error return.
int wait4pid(int pid)
int FAST_FUNC wait4pid(int pid)
{
int status;
@@ -101,7 +101,7 @@ int wait4pid(int pid)
}
#if ENABLE_FEATURE_PREFER_APPLETS
void save_nofork_data(struct nofork_save_area *save)
void FAST_FUNC save_nofork_data(struct nofork_save_area *save)
{
memcpy(&save->die_jmp, &die_jmp, sizeof(die_jmp));
save->applet_name = applet_name;
@@ -111,7 +111,7 @@ void save_nofork_data(struct nofork_save_area *save)
save->saved = 1;
}
void restore_nofork_data(struct nofork_save_area *save)
void FAST_FUNC restore_nofork_data(struct nofork_save_area *save)
{
memcpy(&die_jmp, &save->die_jmp, sizeof(die_jmp));
applet_name = save->applet_name;
@@ -120,7 +120,7 @@ void restore_nofork_data(struct nofork_save_area *save)
die_sleep = save->die_sleep;
}
int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv)
int FAST_FUNC run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **argv)
{
int rc, argc;
@@ -166,7 +166,7 @@ int run_nofork_applet_prime(struct nofork_save_area *old, int applet_no, char **
return rc & 0xff; /* don't confuse people with "exitcodes" >255 */
}
int run_nofork_applet(int applet_no, char **argv)
int FAST_FUNC run_nofork_applet(int applet_no, char **argv)
{
struct nofork_save_area old;
@@ -176,7 +176,7 @@ int run_nofork_applet(int applet_no, char **argv)
}
#endif /* FEATURE_PREFER_APPLETS */
int spawn_and_wait(char **argv)
int FAST_FUNC spawn_and_wait(char **argv)
{
int rc;
#if ENABLE_FEATURE_PREFER_APPLETS
@@ -210,7 +210,7 @@ int spawn_and_wait(char **argv)
}
#if !BB_MMU
void re_exec(char **argv)
void FAST_FUNC re_exec(char **argv)
{
/* high-order bit of first char in argv[0] is a hidden
* "we have (already) re-execed, don't do it again" flag */
@@ -219,7 +219,7 @@ void re_exec(char **argv)
bb_perror_msg_and_die("exec %s", bb_busybox_exec_path);
}
void forkexit_or_rexec(char **argv)
void FAST_FUNC forkexit_or_rexec(char **argv)
{
pid_t pid;
/* Maybe we are already re-execed and come here again? */
@@ -237,7 +237,7 @@ void forkexit_or_rexec(char **argv)
#else
/* Dance around (void)...*/
#undef forkexit_or_rexec
void forkexit_or_rexec(void)
void FAST_FUNC forkexit_or_rexec(void)
{
pid_t pid;
pid = fork();
@@ -252,7 +252,7 @@ void forkexit_or_rexec(void)
/* Due to a #define in libbb.h on MMU systems we actually have 1 argument -
* char **argv "vanishes" */
void bb_daemonize_or_rexec(int flags, char **argv)
void FAST_FUNC bb_daemonize_or_rexec(int flags, char **argv)
{
int fd;
@@ -286,7 +286,7 @@ void bb_daemonize_or_rexec(int flags, char **argv)
}
}
void bb_sanitize_stdio(void)
void FAST_FUNC bb_sanitize_stdio(void)
{
bb_daemonize_or_rexec(DAEMON_ONLY_SANITIZE, NULL);
}

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
void bb_warn_ignoring_args(int n)
void FAST_FUNC bb_warn_ignoring_args(int n)
{
if (n) {
bb_error_msg("ignoring all arguments");

View File

@@ -9,7 +9,7 @@
#include "libbb.h"
FILE *fopen_or_warn(const char *path, const char *mode)
FILE* FAST_FUNC fopen_or_warn(const char *path, const char *mode)
{
FILE *fp = fopen(path, mode);
if (!fp) {

View File

@@ -14,7 +14,7 @@
#include "libbb.h"
FILE *fopen_or_warn_stdin(const char *filename)
FILE* FAST_FUNC fopen_or_warn_stdin(const char *filename)
{
FILE *fp = stdin;
@@ -26,7 +26,7 @@ FILE *fopen_or_warn_stdin(const char *filename)
return fp;
}
FILE *xfopen_stdin(const char *filename)
FILE* FAST_FUNC xfopen_stdin(const char *filename)
{
FILE *fp = fopen_or_warn_stdin(filename);
if (fp)
@@ -34,7 +34,7 @@ FILE *xfopen_stdin(const char *filename)
xfunc_die(); /* We already output an error message. */
}
int open_or_warn_stdin(const char *filename)
int FAST_FUNC open_or_warn_stdin(const char *filename)
{
int fd = STDIN_FILENO;

View File

@@ -11,7 +11,7 @@
/* Open file and write string str to it, close file.
* Die on any open or write-error. */
void xopen_xwrite_close(const char* file, const char* str)
void FAST_FUNC xopen_xwrite_close(const char* file, const char* str)
{
int fd = xopen(file, O_WRONLY);

Some files were not shown because too many files have changed in this diff Show More