X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5b5f7e3b59ec2e2b45a35edf337cbed7fcd94f30..8982a89b24be0a0b43c85ec64d89b70c941a050c:/rsync.h diff --git a/rsync.h b/rsync.h index 013ba700..6dc5a9c5 100644 --- a/rsync.h +++ b/rsync.h @@ -113,7 +113,7 @@ #define XFLG_WORD_SPLIT (1<<3) #define XFLG_DIRECTORY (1<<4) #define XFLG_NO_PREFIXES (1<<5) -#define XFLG_ABS_PATH (1<<6) +#define XFLG_ANCHORED2ABS (1<<6) #define PERMS_REPORT (1<<0) #define PERMS_SKIP_MTIME (1<<1) @@ -473,9 +473,12 @@ struct file_struct { char *link; /* Points to symlink string, if a symlink */ } u; OFF_T length; - char *basename; - char *dirname; - char *basedir; + char *basename; /* The current item's name (AKA filename) */ + char *dirname; /* The directory info inside the transfer */ + union { + char *root; /* Sender-side dir info outside transfer */ + int depth; /* Receiver-side directory depth info */ + } dir; union { struct idev *idev; struct hlink *links; @@ -515,6 +518,7 @@ struct file_list { alloc_pool_t hlink_pool; int count; int malloced; + int low, high; }; #define SUMFLG_SAME_OFFSET (1<<0) @@ -594,15 +598,6 @@ struct stats { }; -/* we need this function because of the silly way in which duplicate - entries are handled in the file lists - we can't change this - without breaking existing versions */ -static inline int flist_up(struct file_list *flist, int i) -{ - while (!flist->files[i]->basename) i++; - return i; -} - #include "byteorder.h" #include "lib/mdfour.h" #include "lib/wildmatch.h"