Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-27 16:31:24 +00:00
Code Issues Projects Releases Wiki Activity

Stub out the syscall, not the whole application. The stubbed

Browse Source 
out syscall sets errno properly and whines about missing kernel
support.
 -Erik
This commit is contained in:
Eric Andersen 2001-02-24 19:17:07 +00:00
parent dc12190ba2
commit d160a27ec1
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pivot_root.c
View File

@ -3,24 +3,35 @@
* pivot_root.c - Change root file system. Based on util-linux 2.10s * pivot_root.c - Change root file system. Based on util-linux 2.10s
* *
* busyboxed by Evin Robertson * busyboxed by Evin Robertson
* pivot_root syscall stubbed by Erik Andersen, so it will compile
* regardless of the kernel being used.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include "busybox.h" #include "busybox.h"
#ifndef __NR_pivot_root #ifndef __NR_pivot_root
#warning This kernel does not support the pivot_root syscall #warning This kernel does not support the pivot_root syscall
#warning The pivot_root application is being stubbed out... #warning The pivot_root system call is being stubbed out...
int pivot_root_main(int argc, char **argv) int pivot_root(const char * new_root,const char * put_old)
{ {
printf("Please recompile with a kernel supporting the pivot_root syscall.\n"); /* BusyBox was compiled against a kernel that did not support
return 0; * 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 #else
static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old) static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
#endif
int pivot_root_main(int argc, char **argv) int pivot_root_main(int argc, char **argv)
@ -28,13 +39,12 @@ int pivot_root_main(int argc, char **argv)
if (argc != 3) if (argc != 3)
show_usage(); show_usage();
if (pivot_root(argv[1],argv[2]) < 0) if (pivot_root(argv[1],argv[2]) < 0)
perror_msg_and_die("pivot_root"); perror_msg_and_die("pivot_root");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#endif
/* /*

26
util-linux/pivot_root.c
View File

@ -3,24 +3,35 @@
* pivot_root.c - Change root file system. Based on util-linux 2.10s * pivot_root.c - Change root file system. Based on util-linux 2.10s
* *
* busyboxed by Evin Robertson * busyboxed by Evin Robertson
* pivot_root syscall stubbed by Erik Andersen, so it will compile
* regardless of the kernel being used.
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <linux/unistd.h> #include <linux/unistd.h>
#include "busybox.h" #include "busybox.h"
#ifndef __NR_pivot_root #ifndef __NR_pivot_root
#warning This kernel does not support the pivot_root syscall #warning This kernel does not support the pivot_root syscall
#warning The pivot_root application is being stubbed out... #warning The pivot_root system call is being stubbed out...
int pivot_root_main(int argc, char **argv) int pivot_root(const char * new_root,const char * put_old)
{ {
printf("Please recompile with a kernel supporting the pivot_root syscall.\n"); /* BusyBox was compiled against a kernel that did not support
return 0; * 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 #else
static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old) static _syscall2(int,pivot_root,const char *,new_root,const char *,put_old)
#endif
int pivot_root_main(int argc, char **argv) int pivot_root_main(int argc, char **argv)
@ -28,13 +39,12 @@ int pivot_root_main(int argc, char **argv)
if (argc != 3) if (argc != 3)
show_usage(); show_usage();
if (pivot_root(argv[1],argv[2]) < 0) if (pivot_root(argv[1],argv[2]) < 0)
perror_msg_and_die("pivot_root"); perror_msg_and_die("pivot_root");
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
#endif
/* /*