X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/264042760bd909eeca281dc8c937357e98bf6bf8..45d8bfe09e10cecb49b030767d4bfc995d42b903:/flist.c diff --git a/flist.c b/flist.c index 5b80f3e1..325c101f 100644 --- a/flist.c +++ b/flist.c @@ -396,8 +396,7 @@ static void send_file_entry(struct file_struct *file, int f) flags |= XMIT_TOP_DIR; if ((flags & 0xFF00) || !flags) { flags |= XMIT_EXTENDED_FLAGS; - write_byte(f, flags); - write_byte(f, flags >> 8); + write_shortint(f, flags); } else write_byte(f, flags); } else { @@ -719,7 +718,7 @@ static struct file_struct *receive_file_entry(struct file_list *flist, * statting directories if we're not recursing, but this is not a very * important case. Some systems may not have d_type. **/ -struct file_struct *make_file(char *fname, struct file_list *flist, +struct file_struct *make_file(const char *fname, struct file_list *flist, STRUCT_STAT *stp, unsigned short flags, int filter_level) { @@ -794,7 +793,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } - /* We only care about directories because we need to avoid recursing + /* -x only affects directories because we need to avoid recursing * into a mount-point directory, not to avoid copying a symlinked * file if -L (or similar) was specified. */ if (one_file_system && st.st_dev != filesystem_dev