diff options
| -rw-r--r-- | include/libbb.h | 13 | ||||
| -rw-r--r-- | libbb/module_syscalls.c | 47 | ||||
| -rw-r--r-- | libbb/syscalls.c | 80 |
3 files changed, 77 insertions, 63 deletions
diff --git a/include/libbb.h b/include/libbb.h index a54ab4d5c..2828456bc 100644 --- a/include/libbb.h +++ b/include/libbb.h @@ -66,6 +66,19 @@ extern int daemon (int nochdir, int noclose); char *strtok_r(char *s, const char *delim, char **ptrptr); #endif +/* Convenience macros to test the version of gcc. */ +#if defined __GNUC__ && defined __GNUC_MINOR__ +# define __GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define __GNUC_PREREQ(maj, min) 0 +#endif + +/* __restrict is known in EGCS 1.2 and above. */ +#if !__GNUC_PREREQ (2,92) +# define __restrict /* Ignore */ +#endif + /* Some useful definitions */ #define FALSE ((int) 0) #define TRUE ((int) 1) diff --git a/libbb/module_syscalls.c b/libbb/module_syscalls.c index 8fe9e525c..b0ace74ea 100644 --- a/libbb/module_syscalls.c +++ b/libbb/module_syscalls.c @@ -37,42 +37,47 @@ #if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)) /* These syscalls are not included as part of libc5 */ -_syscall1(int, delete_module, const char *, name); -_syscall1(int, get_kernel_syms, __ptr_t, ks); +int delete_module(const char *name) +{ + return(syscall(__NR_delete_module, name)); +} +int get_kernel_syms(__ptr_t ks) +{ + return(syscall(__NR_get_kernel_syms, ks)); +} /* This may have 5 arguments (for old 2.0 kernels) or 2 arguments * (for 2.2 and 2.4 kernels). Use the greatest common denominator, * and let the kernel cope with whatever it gets. Its good at that. */ -_syscall5(int, init_module, void *, first, void *, second, void *, third, - void *, fourth, void *, fifth); +int init_module(void *first, void *second, void *third, void *fourth, void *fifth) +{ + return(syscall(__NR_init_module, first, second, third, fourth, fifth)); +} +int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret) +{ #ifndef __NR_query_module #warning This kernel does not support the query_module syscall #warning -> The query_module system call is being stubbed out... -int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret) -{ - bb_error_msg("\n\nTo make this application work, you will need to recompile\n" - "with a kernel supporting the query_module system call. -Erik\n"); - errno=ENOSYS; - return -1; -} + bb_error_msg("\n\nTo make this application work, you will need to recompile\n" + "BusyBox with a kernel supporting the query_module system call.\n"); + errno=ENOSYS; + return -1; #else -_syscall5(int, query_module, const char *, name, int, which, - void *, buf, size_t, bufsize, size_t*, ret); + return(syscall(__NR_query_module, name, which, buf, bufsize, ret)); #endif +} /* Jump through hoops to fixup error return codes */ -#define __NR___create_module __NR_create_module -static inline _syscall2(long, __create_module, const char *, name, size_t, size) unsigned long create_module(const char *name, size_t size) { - long ret = __create_module(name, size); + long ret = syscall(__NR_create_module, name, size); - if (ret == -1 && errno > 125) { - ret = -errno; - errno = 0; - } - return ret; + if (ret == -1 && errno > 125) { + ret = -errno; + errno = 0; + } + return ret; } #endif /* __GNU_LIBRARY__ < 5 */ diff --git a/libbb/syscalls.c b/libbb/syscalls.c index 8d8c689f1..2434cb453 100644 --- a/libbb/syscalls.c +++ b/libbb/syscalls.c @@ -34,71 +34,67 @@ #endif #include "libbb.h" -#if defined(__ia64__) int sysfs( int option, unsigned int fs_index, char * buf) { return(syscall(__NR_sysfs, option, fs_index, buf)); } -#else -_syscall3(int, sysfs, int, option, unsigned int, fs_index, char *, buf); -#endif +int pivot_root(const char * new_root,const char * put_old) +{ #ifndef __NR_pivot_root #warning This kernel does not support the pivot_root syscall #warning -> The pivot_root system call is being stubbed out... -int pivot_root(const char * new_root,const char * put_old) -{ - /* BusyBox was compiled against a kernel that did not support - * the pivot_root system call. To make this application work, - * you will need to recompile with a kernel supporting the - * pivot_root system call. - */ - bb_error_msg("\n\nTo make this application work, you will need to recompile\n" - "with a kernel supporting the pivot_root system call. -Erik\n"); - errno=ENOSYS; - return -1; -} + /* BusyBox was compiled against a kernel that did not support + * the pivot_root system call. To make this application work, + * you will need to recompile with a kernel supporting the + * pivot_root system call. + */ + bb_error_msg("\n\nTo make this application work, you will need to recompile\n" + "BusyBox with a kernel supporting the pivot_root system call.\n"); + errno=ENOSYS; + return -1; #else -# if defined(__ia64__) - int pivot_root(const char * new_root,const char * put_old) - { - return(syscall(__NR_pivot_root, new_root, put_old)); - } -# else - _syscall2(int,pivot_root,const char *,new_root,const char *,put_old); -# endif + return(syscall(__NR_pivot_root, new_root, put_old)); #endif - +} #if __GNU_LIBRARY__ < 5 || ((__GLIBC__ <= 2) && (__GLIBC_MINOR__ < 1)) + /* These syscalls are not included as part of libc5 */ -_syscall2(int, bdflush, int, func, int, data); +int bdflush(int func, int data) +{ + return(syscall(__NR_bdflush, func, data)); +} #ifndef __alpha__ # define __NR_klogctl __NR_syslog - _syscall3(int, klogctl, int, type, char *, b, int, len); +int klogctl(int type, char *b, int len) +{ + return(syscall(__NR_klogctl, type, b, len)); +} #endif -#ifndef __NR_umount2 -# warning This kernel does not support the umount2 syscall -# warning -> The umount2 system call is being stubbed out... + int umount2(const char * special_file, int flags) { - /* BusyBox was compiled against a kernel that did not support - * the umount2 system call. To make this application work, - * you will need to recompile with a kernel supporting the - * umount2 system call. - */ - bb_error_msg("\n\nTo make this application work, you will need to recompile\n" - "with a kernel supporting the umount2 system call. -Erik\n"); - errno=ENOSYS; - return -1; -} -# else -_syscall2(int, umount2, const char *, special_file, int, flags); +#ifndef __NR_pivot_root +#warning This kernel does not support the umount2 syscall +#warning -> The umount2 system call is being stubbed out... + /* BusyBox was compiled against a kernel that did not support + * the umount2 system call. To make this application work, + * you will need to recompile with a kernel supporting the + * umount2 system call. + */ + bb_error_msg("\n\nTo make this application work, you will need to recompile\n" + "BusyBox with a kernel supporting the umount2 system call.\n"); + errno=ENOSYS; + return -1; +#else + return(syscall(__NR_umount2, special_file, flags)); #endif +} #endif /* __GNU_LIBRARY__ < 5 */ |