mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-24 23:05:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

- Changed XMIT_TOP_DIR to XMIT_DEL_START.

Browse Source 
- Changed FLAG_TOP_DIR to FLAG_DEL_START.
This commit is contained in:
Wayne Davison
2005-01-21 00:34:37 +00:00
parent 8c48382049
commit 71e27c463d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
flist.c
View File

@@ -422,11 +422,11 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
/* We must make sure we don't send a zero flag byte or the
* other end will terminate the flist transfer. Note that
* the use of XMIT_TOP_DIR on a non-dir has no meaning, so
* the use of XMIT_DEL_START on a non-dir has no meaning, so
* it's harmless way to add a bit to the first flag byte. */
if (protocol_version >= 28) {
if (!flags && !S_ISDIR(mode))
flags |= XMIT_TOP_DIR;
flags |= XMIT_DEL_START;
if ((flags & 0xFF00) || !flags) {
flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
@@ -435,7 +435,7 @@ void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
write_byte(f, flags);
} else {
if (!(flags & 0xFF) && !S_ISDIR(mode))
flags |= XMIT_TOP_DIR;
flags |= XMIT_DEL_START;
if (!(flags & 0xFF))
flags |= XMIT_LONG_NAME;
write_byte(f, flags);
@@ -645,7 +645,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
memset(bp, 0, file_struct_len);
bp += file_struct_len;
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->flags = flags & XMIT_DEL_START ? FLAG_DEL_START : 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
@@ -1212,7 +1212,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
if (one_file_system)
set_filesystem(fname);
send_file_name(f, flist, fname, recurse, XMIT_TOP_DIR);
send_file_name(f, flist, fname, recurse, XMIT_DEL_START);
if (olddir[0]) {
flist_dir = NULL;
@@ -1475,8 +1475,8 @@ static void clean_flist(struct file_list *flist, int strip_root, int no_dups)
/* Make sure that if we unduplicate '.', that we don't
* lose track of a user-specified starting point (or
* else deletions will mysteriously fail with -R). */
if (flist->files[i]->flags & FLAG_TOP_DIR)
flist->files[prev_i]->flags |= FLAG_TOP_DIR;
if (flist->files[i]->flags & FLAG_DEL_START)
flist->files[prev_i]->flags |= FLAG_DEL_START;
clear_file(i, flist);
} else

2
receiver.c
View File

@@ -82,7 +82,7 @@ void delete_files(struct file_list *flist)
}
for (j = 0; j < flist->count; j++) {
if (!(flist->files[j]->flags & FLAG_TOP_DIR)
if (!(flist->files[j]->flags & FLAG_DEL_START)
|| !S_ISDIR(flist->files[j]->mode))
continue;

4
rsync.h
View File

@@ -41,7 +41,7 @@
/* 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 */
@@ -57,7 +57,7 @@
/* 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 */