emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A number of cleanups. Now compiles with libc5, glibc, and uClibc. Fix a few

Browse Source 
shadowed variables.  Move (almost) all syscalls to libbb/syscalls.c, so I can
handle them sanely and all at once.
 -Erik
This commit is contained in:
Eric Andersen
2001-04-05 03:14:39 +00:00
parent 3c0364f391
commit e76c3b08e1
33 changed files with 168 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
util-linux/dmesg.c
View File

@ -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)

6
util-linux/mount.c
View File

@ -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 */

23
util-linux/pivot_root.c
View File

@ -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)
{

15
util-linux/swaponoff.c
View File

@ -29,14 +29,17 @@
#include <string.h>
#include <stdlib.h>
#include <sys/mount.h>
#include <sys/syscall.h>
#include <linux/unistd.h>
#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 _syscall2(int, swapon, const char *, path, int, flags);
static _syscall1(int, swapoff, const char *, path);
static int whichApp;
static const int SWAPON_APP = 1;