X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvunify.c;h=769214abcd718304f8c46fd8c2f825f11ac80c94;hb=44c84cff90ca76559278b8316a2dd65743ae8db9;hp=cf01597ec80d04a11206d5dc7f1e56b5ae57a18f;hpb=9adab58f20edc732945c7e4072df3c61680592c4;p=util-vserver.git diff --git a/util-vserver/src/vunify.c b/util-vserver/src/vunify.c index cf01597..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; @@ -69,7 +78,7 @@ showHelp(int fd, char const *cmd, int res) " done (in combination with '-v')\n" " -v ... verbose mode\n" " -x ... do not cross filesystems; this is valid in manual\n" - " mode only and will be ignored for vserver unification\n" + " mode only and will be ignored for vserver unification\n\n" "Please report bugs to " PACKAGE_BUGREPORT "\n"); #if 0 " -C ... use cached excludelists; usually they will be\n" @@ -90,7 +99,7 @@ showVersion() exit(0); } -#include "vunify-compare.ic" +#include "vunify-compare.hc" // Returns 'false' iff one of the files is not existing, or of the files are different/not unifyable static bool @@ -226,7 +235,7 @@ EsafeChdir(char const *path, struct stat const *exp_stat) FatalErrnoError(safeChdir(path, exp_stat)==-1, "safeChdir()"); } -#include "vunify-doit.ic" +#include "vunify-doit.hc" static bool doit(struct MatchList const *mlist, @@ -382,7 +391,7 @@ visitDir(char const *name, struct stat const *expected_stat) global_info.state = old_state; } -#include "vunify-init.ic" +#include "vunify-init.hc" int main(int argc, char *argv[]) {