X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e4977b0b9f58ff54c34dea25a4a59f164fd6b6e5..67a28eb2560121c413a4a00eb493dc0beb77c249:/rsync.h diff --git a/rsync.h b/rsync.h index 785eb193..80fd137c 100644 --- a/rsync.h +++ b/rsync.h @@ -121,7 +121,9 @@ #define PDIR_CREATE 1 #define PDIR_DELETE 0 -#define FNAMECMP_BASIS_DIR 0x00 +/* Note: 0x00 - 0x7F are used for basis_dir[] indexes! */ +#define FNAMECMP_BASIS_DIR_LOW 0x00 /* Must remain 0! */ +#define FNAMECMP_BASIS_DIR_HIGH 0x7F #define FNAMECMP_FNAME 0x80 #define FNAMECMP_PARTIAL_DIR 0x81 #define FNAMECMP_BACKUP 0x82 @@ -476,7 +478,7 @@ struct file_list { struct sum_buf { OFF_T offset; /**< offset in file of this chunk */ - unsigned int len; /**< length of chunk of file */ + int32 len; /**< length of chunk of file */ uint32 sum1; /**< simple checksum */ short flags; /**< flag bits */ char sum2[SUM_LENGTH]; /**< checksum */ @@ -485,8 +487,8 @@ struct sum_buf { struct sum_struct { OFF_T flength; /**< total file length */ size_t count; /**< how many chunks */ - unsigned int blength; /**< block_length */ - unsigned int remainder; /**< flength % block_length */ + int32 blength; /**< block_length */ + int32 remainder; /**< flength % block_length */ int s2length; /**< sum2_length */ struct sum_buf *sums; /**< points to info for each chunk */ }; @@ -591,13 +593,6 @@ extern int errno; #define SUPPORT_LINKS HAVE_READLINK #define SUPPORT_HARD_LINKS HAVE_LINK -/* This could be bad on systems which have no lchown and where chown - * follows symbollic links. On such systems it might be better not to - * try to chown symlinks at all. */ -#ifndef HAVE_LCHOWN -#define lchown chown -#endif - #define SIGNAL_CAST (RETSIGTYPE (*)()) #ifndef EWOULDBLOCK