--- embedaddon/rsync/proto.h	2013/10/14 07:51:14	1.1.1.2
+++ embedaddon/rsync/proto.h	2016/11/01 09:54:32	1.1.1.3
@@ -22,7 +22,7 @@ void check_batch_flags(void);
 void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt);
 uint32 get_checksum1(char *buf1, int32 len);
 void get_checksum2(char *buf, int32 len, char *sum);
-void file_checksum(char *fname, char *sum, OFF_T size);
+void file_checksum(const char *fname, const STRUCT_STAT *st_p, char *sum);
 void sum_init(int seed);
 void sum_update(const char *p, int32 len);
 int sum_end(char *sum);
@@ -89,9 +89,10 @@ struct file_struct *make_file(const char *fname, struc
 void unmake_file(struct file_struct *file);
 void send_extra_file_list(int f, int at_least);
 struct file_list *send_file_list(int f, int argc, char *argv[]);
-struct file_list *recv_file_list(int f);
+struct file_list *recv_file_list(int f, int dir_ndx);
 void recv_additional_file_list(int f);
 int flist_find(struct file_list *flist, struct file_struct *f);
+int flist_find_name(struct file_list *flist, const char *fname, int want_dir_match);
 int flist_find_ignore_dirness(struct file_list *flist, struct file_struct *f);
 void clear_file(struct file_struct *file);
 struct file_list *flist_new(int flags, char *msg);
@@ -106,7 +107,7 @@ void itemize(const char *fnamecmp, struct file_struct 
 	     stat_x *sxp, int32 iflags, uchar fnamecmp_type,
 	     const char *xname);
 int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st);
-int atomic_create(struct file_struct *file, char *fname, const char *lnk,
+int atomic_create(struct file_struct *file, char *fname, const char *slnk, const char *hlnk,
 		  dev_t rdev, stat_x *sxp, int del_for_flag);
 void check_for_finished_files(int itemizing, enum logcode code, int check_redo);
 void generate_files(int f_out, const char *local_name);
@@ -166,6 +167,7 @@ void write_int(int f, int32 x);
 void write_varint(int f, int32 x);
 void write_varlong(int f, int64 x, uchar min_bytes);
 void write_longint(int f, int64 x);
+void write_bigbuf(int f, const char *buf, size_t len);
 void write_buf(int f, const char *buf, size_t len);
 void write_sbuf(int f, const char *buf);
 void write_byte(int f, uchar c);
@@ -252,7 +254,7 @@ void read_del_stats(int f);
 int child_main(int argc, char *argv[]);
 void start_server(int f_in, int f_out, int argc, char *argv[]);
 int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]);
-RETSIGTYPE remember_children(UNUSED(int val));
+void remember_children(UNUSED(int val));
 const char *get_panic_action(void);
 int main(int argc,char *argv[]);
 void match_sums(int f, struct sum_struct *s, struct map_struct *buf, OFF_T len);
@@ -287,7 +289,7 @@ mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, 
 		 int exists);
 int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
 		   const char *fnamecmp, int flags);
-RETSIGTYPE sig_int(int sig_num);
+void sig_int(int sig_num);
 int finish_transfer(const char *fname, const char *fnametmp,
 		    const char *fnamecmp, const char *partialptr,
 		    struct file_struct *file, int ok_to_set_time,
@@ -347,7 +349,7 @@ uid_t recv_user_name(int f, uid_t uid);
 gid_t recv_group_name(int f, gid_t gid, uint16 *flags_ptr);
 void recv_id_list(int f, struct file_list *flist);
 void parse_name_map(char *map, BOOL usernames);
-const char *getallgroups(uid_t uid, gid_t *gid_list, int *size_ptr);
+const char *getallgroups(uid_t uid, item_list *gid_list);
 void set_nonblocking(int fd);
 void set_blocking(int fd);
 int fd_pair(int fd[2]);
@@ -368,7 +370,7 @@ void strlower(char *s);
 size_t pathjoin(char *dest, size_t destsize, const char *p1, const char *p2);
 size_t stringjoin(char *dest, size_t destsize, ...);
 int count_dir_elements(const char *p);
-unsigned int clean_fname(char *name, int flags);
+int clean_fname(char *name, int flags);
 char *sanitize_path(char *dest, const char *p, const char *rootdir, int depth,
 		    int flags);
 int change_dir(const char *dir, int set_path_only);