Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Changed --keep-dirs (-k) into --dirs (-d).
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
c06ffac
..
cdb9b2a
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-41,7
+41,7
@@
/* These flags are only used during the flist transfer. */
/* These flags are only used during the flist transfer. */
-#define XMIT_
TOP_DIR
(1<<0)
+#define XMIT_
DEL_START
(1<<0)
#define XMIT_SAME_MODE (1<<1)
#define XMIT_EXTENDED_FLAGS (1<<2)
#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */
#define XMIT_SAME_MODE (1<<1)
#define XMIT_EXTENDED_FLAGS (1<<2)
#define XMIT_SAME_RDEV_pre28 XMIT_EXTENDED_FLAGS /* Only in protocols < 28 */
@@
-57,7
+57,7
@@
/* These flags are used in the live flist data. */
/* These flags are used in the live flist data. */
-#define FLAG_
TOP_DIR
(1<<0)
+#define FLAG_
DEL_START
(1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
@@
-129,6
+129,11
@@
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
#define FNAMECMP_PARTIAL_DIR 0x81
#define FNAMECMP_BACKUP 0x82
+/* For calling delete_file() */
+#define DEL_DIR (1<<0)
+#define DEL_RECURSE (1<<1) /* recurse even w/o --force */
+#define DEL_TERSE (1<<2)
+
/* Log-message categories. FLOG is only used on the daemon side to
* output messages to the log file. */
/* Log-message categories. FLOG is only used on the daemon side to
* output messages to the log file. */
@@
-332,17
+337,6
@@
enum msgcode {
#define INT64_IS_OFF_T
#endif
#define INT64_IS_OFF_T
#endif
-#if (SIZEOF_LONG == 8)
-#define uint64 unsigned long
-#elif (SIZEOF_INT == 8)
-#define uint64 unsigned int
-#elif HAVE_LONGLONG
-#define uint64 unsigned long long
-#else
-/* As long as it gets... */
-#define uint64 unsigned off_t
-#endif
-
/* Starting from protocol version 26, we always use 64-bit
* ino_t and dev_t internally, even if this platform does not
* allow files to have 64-bit inums. That's because the
/* Starting from protocol version 26, we always use 64-bit
* ino_t and dev_t internally, even if this platform does not
* allow files to have 64-bit inums. That's because the
@@
-370,8
+364,8
@@
enum msgcode {
*/
struct idev {
*/
struct idev {
-
u
int64 inode;
-
u
int64 dev;
+ int64 inode;
+ int64 dev;
};
#ifndef MIN
};
#ifndef MIN