summaryrefslogtreecommitdiff
path: root/libbb/syscalls.c
diff options
context:
space:
mode:
authorEric Andersen2003-05-26 18:48:56 +0000
committerEric Andersen2003-05-26 18:48:56 +0000
commit82ab3d7c3e65998e0b033347072ee32cf5d61b42 (patch)
tree23318f32d86a7f4c591bd9a8ef895f4e32929243 /libbb/syscalls.c
parentb0cfca75442293b4b670584d83c39f9cea9f5a8b (diff)
downloadbusybox-82ab3d7c3e65998e0b033347072ee32cf5d61b42.zip
busybox-82ab3d7c3e65998e0b033347072ee32cf5d61b42.tar.gz
Make all syscall declarations use the syscall() function
Diffstat (limited to 'libbb/syscalls.c')
-rw-r--r--libbb/syscalls.c80
1 files changed, 38 insertions, 42 deletions
diff --git a/libbb/syscalls.c b/libbb/syscalls.c
index 8d8c689..2434cb4 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 */