diff options
author | Eric Andersen | 2001-04-05 03:14:39 +0000 |
---|---|---|
committer | Eric Andersen | 2001-04-05 03:14:39 +0000 |
commit | e76c3b08e105147e3cef7e8d38d65da2fac6b2e1 (patch) | |
tree | 87f705b9e4e4e48700ac61e9538c637ae2b395a7 /util-linux | |
parent | 3c0364f3911ec9f43e1c8c96ec2c8e30b1b52c47 (diff) | |
download | busybox-e76c3b08e105147e3cef7e8d38d65da2fac6b2e1.zip busybox-e76c3b08e105147e3cef7e8d38d65da2fac6b2e1.tar.gz |
A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few
shadowed variables. Move (almost) all syscalls to libbb/syscalls.c, so I can
handle them sanely and all at once.
-Erik
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/dmesg.c | 13 | ||||
-rw-r--r-- | util-linux/mount.c | 6 | ||||
-rw-r--r-- | util-linux/pivot_root.c | 23 | ||||
-rw-r--r-- | util-linux/swaponoff.c | 13 |
4 files changed, 14 insertions, 41 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index 2c85ed3..73de6d1 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -20,18 +20,13 @@ #include <getopt.h> #if __GNU_LIBRARY__ < 5 -#include <sys/syscall.h> -#include <linux/unistd.h> -#ifndef __alpha__ -# define __NR_klogctl __NR_syslog -static inline _syscall3(int, klogctl, int, type, char *, b, int, len); -#else /* __alpha__ */ -#define klogctl syslog -#endif - +# ifdef __alpha__ +# define klogctl syslog +# endif #else # include <sys/klog.h> #endif + #include "busybox.h" int dmesg_main(int argc, char **argv) diff --git a/util-linux/mount.c b/util-linux/mount.c index 57dc73e..5b6ec1e 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -84,11 +84,7 @@ extern int mount (__const char *__special_file, __const char *__dir, extern int umount (__const char *__special_file); extern int umount2 (__const char *__special_file, int __flags); -#include <sys/syscall.h> -#include <linux/unistd.h> -static int sysfs( int option, unsigned int fs_index, char * buf); -_syscall3(int, sysfs, int, option, unsigned int, fs_index, char *, buf); - +extern int sysfs( int option, unsigned int fs_index, char * buf); extern const char mtab_file[]; /* Defined in utility.c */ diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c index 4d7f8a3..ba26b9c 100644 --- a/util-linux/pivot_root.c +++ b/util-linux/pivot_root.c @@ -9,30 +9,9 @@ #include <stdlib.h> #include <stdio.h> #include <errno.h> -#include <sys/syscall.h> -#include <linux/unistd.h> #include "busybox.h" -#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. - */ - fprintf(stderr, "\n\nTo make this application work, you will need to recompile\n"); - fprintf(stderr, "with a kernel supporting the pivot_root system call. -Erik\n\n"); - errno=ENOSYS; - return -1; -} -#else -static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old) -#endif - - +extern int pivot_root(const char * new_root,const char * put_old); int pivot_root_main(int argc, char **argv) { diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c index 55022ae..ce0e2c6 100644 --- a/util-linux/swaponoff.c +++ b/util-linux/swaponoff.c @@ -29,13 +29,16 @@ #include <string.h> #include <stdlib.h> #include <sys/mount.h> -#include <sys/syscall.h> -#include <linux/unistd.h> -#include "busybox.h" -static _syscall2(int, swapon, const char *, path, int, flags); -static _syscall1(int, swapoff, const char *, path); +#if __GNU_LIBRARY__ < 5 +/* libc5 doesn't have sys/swap.h, define these here. */ +extern int swapon (__const char *__path, int __flags); +extern int swapoff (__const char *__path); +#else +#include <sys/swap.h> +#endif +#include "busybox.h" static int whichApp; |