X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fmodule_syscalls.c;h=a2ff5284ac35731c3643e2ffac4f71e2e94ef4d4;hb=f9584a19ca738762c9bb2ce899fe9c3d9e746da0;hp=87662ff21c2a0980eb967320e89ec4df3a6b15da;hpb=acc7757312fe1a7a69448047d1dbea2ef1c31cde;p=oweals%2Fbusybox.git

diff --git a/libbb/module_syscalls.c b/libbb/module_syscalls.c
index 87662ff21..a2ff5284a 100644
--- a/libbb/module_syscalls.c
+++ b/libbb/module_syscalls.c
@@ -2,8 +2,7 @@
 /*
  * some system calls possibly missing from libc
  *
- * Copyright (C) 1999,2000,2001 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,82 +23,87 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-/* Kernel headers before 2.1.mumble need this on the Alpha to get
-   _syscall* defined.  */
-#define __LIBRARY__
 #include <sys/syscall.h>
-#include <asm/unistd.h>
 #include "libbb.h"
 
+/* uClibc always supplies (possibly ENOSYS) versions of these functions. */
+#ifndef __UCLIBC__
 
-struct old_module_ref
+/* These syscalls are not included in very old glibc versions */
+int delete_module(const char *name)
 {
-  unsigned long module;		/* kernel addresses */
-  unsigned long next;
-};
+#ifndef __NR_delete_module
+#warning This kernel does not support the delete_module syscall
+#warning -> The delete_module system call is being stubbed out...
+    errno=ENOSYS;
+    return -1;
+#else
+    return(syscall(__NR_delete_module, name));
+#endif
+}
 
-struct old_module_symbol
+int get_kernel_syms(__ptr_t ks)
 {
-  unsigned long addr;
-  unsigned long name;
-};
+#ifndef __NR_get_kernel_syms
+#warning This kernel does not support the get_kernel_syms syscall
+#warning -> The get_kernel_syms system call is being stubbed out...
+    errno=ENOSYS;
+    return -1;
+#else
+    return(syscall(__NR_get_kernel_syms, ks));
+#endif
+}
 
-struct old_symbol_table
+/* 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. */
+int init_module(void *first, void *second, void *third, void *fourth, void *fifth)
 {
-  int size;			/* total, including string table!!! */
-  int n_symbols;
-  int n_refs;
-  struct old_module_symbol symbol[0]; /* actual size defined by n_symbols */
-  struct old_module_ref ref[0];	/* actual size defined by n_refs */
-};
+#ifndef __NR_init_module
+#warning This kernel does not support the init_module syscall
+#warning -> The init_module system call is being stubbed out...
+    errno=ENOSYS;
+    return -1;
+#else
+    return(syscall(__NR_init_module, first, second, third, fourth, fifth));
+#endif
+}
 
-struct old_mod_routines
+int query_module(const char *name, int which, void *buf, size_t bufsize, size_t *ret)
 {
-  unsigned long init;
-  unsigned long cleanup;
-};
-
-#define __NR_old_sys_init_module  __NR_init_module
-_syscall5(int, old_sys_init_module, const char *, name, char *, code,
-		  unsigned, codesize, struct old_mod_routines *, routines,
-		  struct old_symbol_table *, symtab);
-
-#if __GNU_LIBRARY__ < 5
-/* These syscalls are not included as part of libc5 */
-_syscall1(int, delete_module, const char *, name);
-_syscall1(int, get_kernel_syms, struct old_kernel_sym *, ks);
-
 #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)
-{
-	fprintf(stderr, "\n\nTo make this application work, you will need to recompile\n");
-	fprintf(stderr, "with a kernel supporting the query_module system call. -Erik\n\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);
+#ifndef __NR_create_module
+#warning This kernel does not support the create_module syscall
+#warning -> The create_module system call is being stubbed out...
+    errno=ENOSYS;
+    return -1;
+#else
+    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
 }
 
-#endif /* __GNU_LIBRARY__ < 5 */
 
+#endif /* __UCLIBC__ */
 
 /* END CODE */
 /*