X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fsrc%2Fvunify.h;h=87568c0f00d2d29296ede4cc20c8336b5030aa83;hb=a917f24ef7b003dcef54a3db2644cf9cb4bc2db2;hp=b3186e5114a31557792b3209875b2727c32a552b;hpb=6c49730f3251c3f4cf721f8a9faf4bfb5ab61e23;p=util-vserver.git diff --git a/util-vserver/src/vunify.h b/util-vserver/src/vunify.h index b3186e5..87568c0 100644 --- a/util-vserver/src/vunify.h +++ b/util-vserver/src/vunify.h @@ -19,7 +19,7 @@ #ifndef H_UTIL_VSERVER_SRC_VUNIFY_H #define H_UTIL_VSERVER_SRC_VUNIFY_H -#include "vunify-matchlist.h" +#include "lib_internal/matchlist.h" struct dirent; struct WalkdownInfo @@ -35,7 +35,7 @@ struct WalkdownInfo struct SkipReason { enum { rsDOTFILE, rsEXCL_DST, rsEXCL_SRC, rsFSTAT, rsNOEXISTS, rsSYMLINK, rsUNIFIED, - rsDIFFERENT } r; + rsSPECIAL, rsDIFFERENT } r; union { struct MatchList const * list; @@ -51,23 +51,22 @@ struct Arguments { bool do_renew; }; +struct stat; -static void visitDirEntry(struct dirent const *) NONNULL((1)); -static void visitDir(char const *, struct stat const *) NONNULL((1)); static bool checkFstat(struct MatchList const * const, PathInfo const * const, PathInfo const * const, - struct stat const ** const, - struct stat * const) NONNULL((1,2,3,4,5)); + struct stat const ** const, struct stat * const, + struct stat *) NONNULL((1,2,3,4,5,6)); static struct MatchList const * checkDirEntry(PathInfo const *, PathInfo const *, - bool *, struct stat *) NONNULL((1,2,3,4)); + bool *, struct stat *, struct stat *) NONNULL((1,2,3,4,5)); static bool updateSkipDepth(PathInfo const *, bool) NONNULL((1)); -static void EsafeChdir(char const *, struct stat const *) NONNULL((1,2)); -static bool doit(struct MatchList const *, PathInfo const *, - char const *dst_path) NONNULL((1,2,3)); +static bool doit(struct MatchList const *, + PathInfo const *, struct stat const *, + char const *dst_path, struct stat const *) NONNULL((1,2,3)); #endif // H_UTIL_VSERVER_SRC_VUNIFY_H