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
Fixed the test to ensure that we don't send a flag-byte of 0 to the
[rsync/rsync.git]
/
flist.c
diff --git
a/flist.c
b/flist.c
index
d6e1cf1
..
eaa1b2d
100644
(file)
--- a/
flist.c
+++ b/
flist.c
@@
-441,19
+441,19
@@
void send_file_entry(struct file_struct *file, int f, unsigned short base_flags)
if (l2 > 255)
flags |= XMIT_LONG_NAME;
if (l2 > 255)
flags |= XMIT_LONG_NAME;
- /* We must make sure we don't send a zero flag
s
byte or
+ /* We must make sure we don't send a zero flag
-
byte or
* the other end will terminate the flist transfer. */
* the other end will terminate the flist transfer. */
- if (
flags == 0
&& !S_ISDIR(mode))
+ if (
!(flags & 0xFF)
&& !S_ISDIR(mode))
flags |= XMIT_TOP_DIR; /* NOTE: no meaning for non-dir */
if (protocol_version >= 28) {
flags |= XMIT_TOP_DIR; /* NOTE: no meaning for non-dir */
if (protocol_version >= 28) {
- if ((flags & 0xFF00) ||
flags == 0
) {
+ if ((flags & 0xFF00) ||
!(flags & 0xFF)
) {
flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
write_byte(f, flags >> 8);
} else
write_byte(f, flags);
} else {
flags |= XMIT_EXTENDED_FLAGS;
write_byte(f, flags);
write_byte(f, flags >> 8);
} else
write_byte(f, flags);
} else {
- if (
flags == 0
)
+ if (
!(flags & 0xFF)
)
flags |= XMIT_LONG_NAME;
write_byte(f, flags);
}
flags |= XMIT_LONG_NAME;
write_byte(f, flags);
}