From 86a23427cca76a5a9befd60c85535a0e738bc3c6 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 6 Feb 2004 14:53:00 +0000 Subject: [PATCH] use new ensc_wrappers/ headers git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@817 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/src/chcontext.c | 8 ++++++-- util-vserver/src/chroot-cat.c | 6 +++++- util-vserver/src/chroot-rm.c | 4 +++- util-vserver/src/exec-cd.c | 6 +++++- util-vserver/src/exec-ulimit.c | 7 ++++++- util-vserver/src/fstool.c | 12 +++++++++--- util-vserver/src/new-namespace.c | 5 ++++- util-vserver/src/pipe-sync.c | 4 +++- util-vserver/src/rpm-fake-resolver.c | 8 ++++++-- util-vserver/src/save_ctxinfo.c | 7 +++++-- util-vserver/src/testsuite/rpm-fake-test.c | 4 +++- util-vserver/src/vps.c | 9 +++++++-- util-vserver/src/vrsetup.c | 8 +++++++- util-vserver/src/vserver-info.c | 6 +++++- util-vserver/src/vserver-stat.c | 9 ++++++--- util-vserver/src/vunify-doit.hc | 3 +-- util-vserver/src/vunify-init.hc | 1 - util-vserver/src/vunify-matchlist.c | 4 +++- util-vserver/src/vunify.c | 11 ++++++++++- 19 files changed, 94 insertions(+), 28 deletions(-) diff --git a/util-vserver/src/chcontext.c b/util-vserver/src/chcontext.c index 431763b..8f40ad3 100644 --- a/util-vserver/src/chcontext.c +++ b/util-vserver/src/chcontext.c @@ -28,8 +28,6 @@ #include "util.h" #include "vserver.h" -#include "wrappers.h" -#include "wrappers-vserver.h" #include "internal.h" #include @@ -39,6 +37,12 @@ #include #include #include +#include + +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include #define CMD_HELP 0x1000 #define CMD_VERSION 0x1001 diff --git a/util-vserver/src/chroot-cat.c b/util-vserver/src/chroot-cat.c index 9b110fd..81017e4 100644 --- a/util-vserver/src/chroot-cat.c +++ b/util-vserver/src/chroot-cat.c @@ -21,11 +21,15 @@ #endif #include "util.h" -#include "wrappers.h" #include #include #include +#include + +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include int wrapper_exit_code = 1; diff --git a/util-vserver/src/chroot-rm.c b/util-vserver/src/chroot-rm.c index 3d453cc..dc34836 100644 --- a/util-vserver/src/chroot-rm.c +++ b/util-vserver/src/chroot-rm.c @@ -21,12 +21,14 @@ #endif #include "util.h" -#include "wrappers.h" #include #include #include +#define ENSC_WRAPPERS_UNISTD 1 +#include + int wrapper_exit_code = 1; static void diff --git a/util-vserver/src/exec-cd.c b/util-vserver/src/exec-cd.c index 28cdd47..4250f72 100644 --- a/util-vserver/src/exec-cd.c +++ b/util-vserver/src/exec-cd.c @@ -21,7 +21,11 @@ #endif #include "util.h" -#include "wrappers.h" +#include + +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include int wrapper_exit_code = 255; diff --git a/util-vserver/src/exec-ulimit.c b/util-vserver/src/exec-ulimit.c index c599220..a4ff4f8 100644 --- a/util-vserver/src/exec-ulimit.c +++ b/util-vserver/src/exec-ulimit.c @@ -20,12 +20,17 @@ # include #endif -#include "wrappers.h" #include "util.h" #include #include #include +#include + +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_RESOURCE 1 +#include #define DECLARE_LIMIT(RES,FNAME) { #FNAME, RLIMIT_##RES } diff --git a/util-vserver/src/fstool.c b/util-vserver/src/fstool.c index 9b750a5..7ae7a1d 100644 --- a/util-vserver/src/fstool.c +++ b/util-vserver/src/fstool.c @@ -22,15 +22,21 @@ #include "fstool.h" #include "util.h" -#include "wrappers.h" -#include "wrappers-dirent.h" #include #include #include #include - +#include +#include +#include +#include + +#define ENSC_WRAPPERS_DIRENT 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include struct Arguments const * global_args = 0; diff --git a/util-vserver/src/new-namespace.c b/util-vserver/src/new-namespace.c index 6277134..9d50a30 100644 --- a/util-vserver/src/new-namespace.c +++ b/util-vserver/src/new-namespace.c @@ -25,7 +25,6 @@ #endif #include "util.h" -#include "wrappers.h" #include "stack-start.h" #include @@ -38,6 +37,10 @@ #include #include +#define ENSC_WRAPPERS_CLONE 1 +#define ENSC_WRAPPERS_WAIT 1 +#include + #ifndef CLONE_NEWNS # define CLONE_NEWNS 0x00020000 #endif diff --git a/util-vserver/src/pipe-sync.c b/util-vserver/src/pipe-sync.c index 1c3076d..acc84a8 100644 --- a/util-vserver/src/pipe-sync.c +++ b/util-vserver/src/pipe-sync.c @@ -21,7 +21,6 @@ #endif #include "util.h" -#include "wrappers.h" #include #include @@ -29,6 +28,9 @@ #include #include +#define ENSC_WRAPPERS_UNISTD 1 +#include "wrappers.h" + int wrapper_exit_code = 2; static void diff --git a/util-vserver/src/rpm-fake-resolver.c b/util-vserver/src/rpm-fake-resolver.c index 7fb15f7..f185c25 100644 --- a/util-vserver/src/rpm-fake-resolver.c +++ b/util-vserver/src/rpm-fake-resolver.c @@ -23,14 +23,18 @@ #include "internal.h" #include "vserver.h" #include "util.h" -#include "wrappers.h" -#include "wrappers-vserver.h" #include #include #include #include #include +#include + +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include #define MAX_RQSIZE 0x1000 diff --git a/util-vserver/src/save_ctxinfo.c b/util-vserver/src/save_ctxinfo.c index 7becf5b..5bd0e22 100644 --- a/util-vserver/src/save_ctxinfo.c +++ b/util-vserver/src/save_ctxinfo.c @@ -25,8 +25,6 @@ #include "vserver.h" #include "internal.h" #include "util.h" -#include "wrappers.h" -#include "wrappers-vserver.h" #include #include @@ -34,6 +32,11 @@ #include #include +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include + int wrapper_exit_code = 255; inline static void diff --git a/util-vserver/src/testsuite/rpm-fake-test.c b/util-vserver/src/testsuite/rpm-fake-test.c index 979950e..1c63ea2 100644 --- a/util-vserver/src/testsuite/rpm-fake-test.c +++ b/util-vserver/src/testsuite/rpm-fake-test.c @@ -20,7 +20,6 @@ # include #endif -#include "src/wrappers.h" #include #include @@ -29,6 +28,9 @@ #include #include +#define ENSC_WRAPPERS_UNISTD 1 +#include + int wrapper_exit_code = 1; int main(int argc, char *argv[]) diff --git a/util-vserver/src/vps.c b/util-vserver/src/vps.c index 99ee4a9..1d8e4de 100644 --- a/util-vserver/src/vps.c +++ b/util-vserver/src/vps.c @@ -21,13 +21,18 @@ #endif #include "util.h" -#include "wrappers.h" -#include "wrappers-vserver.h" #include "pathconfig.h" #include #include #include +#include + +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_STDLIB 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_FCNTL 1 +#include #define CTXNR_WIDTH 5 #define HUNK_SIZE 0x4000 diff --git a/util-vserver/src/vrsetup.c b/util-vserver/src/vrsetup.c index 2876d73..f2d3eee 100644 --- a/util-vserver/src/vrsetup.c +++ b/util-vserver/src/vrsetup.c @@ -20,11 +20,17 @@ # include #endif -#include "wrappers.h" #include "util.h" #include #include +#include +#include + +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_IOCTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include int wrapper_exit_code = 1; diff --git a/util-vserver/src/vserver-info.c b/util-vserver/src/vserver-info.c index 765828d..1a74f54 100644 --- a/util-vserver/src/vserver-info.c +++ b/util-vserver/src/vserver-info.c @@ -21,7 +21,6 @@ #endif #include "util.h" -#include "wrappers.h" #include "internal.h" #include "vserver.h" @@ -30,6 +29,11 @@ #include #include #include +#include + +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include typedef enum { tgNONE,tgCONTEXT, tgRUNNING, tgVDIR, tgNAME, tgCFGDIR, tgAPPDIR, diff --git a/util-vserver/src/vserver-stat.c b/util-vserver/src/vserver-stat.c index 32f6d24..d4c6dc4 100644 --- a/util-vserver/src/vserver-stat.c +++ b/util-vserver/src/vserver-stat.c @@ -37,9 +37,6 @@ #include "vserver.h" #include "util.h" #include "internal.h" -#include "wrappers.h" -#include "wrappers-dirent.h" -#include "wrappers-vserver.h" #include #include @@ -55,6 +52,12 @@ #include #include +#define ENSC_WRAPPERS_DIRENT 1 +#define ENSC_WRAPPERS_VSERVER 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_UNISTD 1 +#include "wrappers.h" + #define PROC_DIR_NAME "/proc" #define CTX_DIR_NAME "/var/run/vservers/" #define CTX_NAME_MAX_LEN 50 diff --git a/util-vserver/src/vunify-doit.hc b/util-vserver/src/vunify-doit.hc index 491db12..c49d720 100644 --- a/util-vserver/src/vunify-doit.hc +++ b/util-vserver/src/vunify-doit.hc @@ -15,10 +15,9 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "wrappers-io.h" - #include #include +#include static bool doitUnify(char const *src, struct stat const *src_stat, diff --git a/util-vserver/src/vunify-init.hc b/util-vserver/src/vunify-init.hc index 6346b33..2282649 100644 --- a/util-vserver/src/vunify-init.hc +++ b/util-vserver/src/vunify-init.hc @@ -15,7 +15,6 @@ // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -#include "wrappers-io.h" #include "pathconfig.h" static void diff --git a/util-vserver/src/vunify-matchlist.c b/util-vserver/src/vunify-matchlist.c index 1c52b0c..2801aa3 100644 --- a/util-vserver/src/vunify-matchlist.c +++ b/util-vserver/src/vunify-matchlist.c @@ -21,11 +21,13 @@ #endif #include "vunify-matchlist.h" -#include "wrappers.h" #include #include +#define ENSC_WRAPPERS_STDLIB 1 +#include + bool MatchList_compare(struct MatchList const *list, char const *path) { diff --git a/util-vserver/src/vunify.c b/util-vserver/src/vunify.c index 943605f..769214a 100644 --- a/util-vserver/src/vunify.c +++ b/util-vserver/src/vunify.c @@ -21,7 +21,6 @@ #endif #include "vunify.h" -#include "wrappers-dirent.h" #include "util.h" #include @@ -32,6 +31,16 @@ #include #include #include +#include +#include +#include + +#define ENSC_WRAPPERS_IO 1 +#define ENSC_WRAPPERS_FCNTL 1 +#define ENSC_WRAPPERS_DIRENT 1 +#define ENSC_WRAPPERS_UNISTD 1 +#define ENSC_WRAPPERS_STDLIB 1 +#include int wrapper_exit_code = 1; -- 1.8.1.5