--- embedaddon/rsync/proto.h	2012/02/17 15:09:30	1.1.1.1
+++ embedaddon/rsync/proto.h	2013/10/14 07:51:14	1.1.1.2
@@ -1,6 +1,6 @@
 /* This file is automatically generated with "make proto". DO NOT EDIT */
 
-int allow_access(char *addr, char *host, char *allow_list, char *deny_list);
+int allow_access(const char *addr, const char **host_ptr, int i);
 void free_acl(stat_x *sxp);
 int get_acl(const char *fname, stat_x *sxp);
 void send_acl(int f, stat_x *sxp);
@@ -15,8 +15,7 @@ char *auth_server(int f_in, int f_out, int module, con
 		  const char *addr, const char *leader);
 void auth_client(int fd, const char *user, const char *challenge);
 char *get_backup_name(const char *fname);
-int make_bak_dir(const char *fullpath);
-int make_backup(const char *fname);
+int make_backup(const char *fname, BOOL prefer_rename);
 void write_stream_flags(int fd);
 void read_stream_flags(int fd);
 void check_batch_flags(void);
@@ -59,25 +58,26 @@ int daemon_main(void);
 void set_allow_inc_recurse(void);
 void setup_protocol(int f_out,int f_in);
 int claim_connection(char *fname, int max_connections);
+enum delret delete_item(char *fbuf, uint16 mode, uint16 flags);
+uint16 get_del_for_flag(uint16 mode);
 void set_filter_dir(const char *dir, unsigned int dirlen);
 void *push_local_filters(const char *dir, unsigned int dirlen);
 void pop_local_filters(void *mem);
 void change_local_filter_dir(const char *dname, int dlen, int dir_depth);
-int check_filter(struct filter_list_struct *listp, enum logcode code,
+int check_filter(filter_rule_list *listp, enum logcode code,
 		 const char *name, int name_is_dir);
-void parse_rule(struct filter_list_struct *listp, const char *pattern,
-		uint32 mflags, int xflags);
-void parse_filter_file(struct filter_list_struct *listp, const char *fname,
-		       uint32 mflags, int xflags);
-char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
+const filter_rule *rule_template(uint32 rflags);
+void parse_filter_str(filter_rule_list *listp, const char *rulestr,
+		     const filter_rule *template, int xflags);
+void parse_filter_file(filter_rule_list *listp, const char *fname, const filter_rule *template, int xflags);
+char *get_rule_prefix(filter_rule *rule, const char *pat, int for_xfer,
 		      unsigned int *plen_ptr);
 void send_filter_list(int f_out);
 void recv_filter_list(int f_in);
 int sparse_end(int f, OFF_T size);
 int flush_write_file(int f);
 int write_file(int f, char *buf, int len);
-struct map_struct *map_file(int fd, OFF_T len, int32 read_size,
-			    int32 blk_size);
+struct map_struct *map_file(int fd, OFF_T len, int32 read_size, int32 blk_size);
 char *map_ptr(struct map_struct *map, OFF_T offset, int32 len);
 int unmap_file(struct map_struct *map);
 void init_flist(void);
@@ -106,6 +106,8 @@ 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,
+		  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);
 struct hashtable *hashtable_create(int size, int key64);
@@ -115,7 +117,7 @@ void init_hard_links(void);
 struct ht_int64_node *idev_find(int64 dev, int64 ino);
 void idev_destroy(void);
 void match_hard_links(struct file_list *flist);
-int hard_link_check(struct file_struct *file, int ndx, const char *fname,
+int hard_link_check(struct file_struct *file, int ndx, char *fname,
 		    int statret, stat_x *sxp, int itemizing,
 		    enum logcode code);
 int hard_link_one(struct file_struct *file, const char *fname,
@@ -124,28 +126,29 @@ void finish_hard_link(struct file_struct *file, const 
 		      STRUCT_STAT *stp, int itemizing, enum logcode code,
 		      int alt_dest);
 int skip_hard_link(struct file_struct *file, struct file_list **flist_p);
+void reduce_iobuf_size(xbuf *out, size_t new_size);
+void restore_iobuf_size(xbuf *out);
+void noop_io_until_death(void);
+int send_msg(enum msgcode code, const char *buf, size_t len, int convert);
+void send_msg_int(enum msgcode code, int num);
 void io_set_sock_fds(int f_in, int f_out);
 void set_io_timeout(int secs);
-void set_msg_fd_in(int fd);
-void set_msg_fd_out(int fd);
 void increment_active_files(int ndx, int itemizing, enum logcode code);
-int send_msg(enum msgcode code, const char *buf, int len, int convert);
-void send_msg_int(enum msgcode code, int num);
-void wait_for_receiver(void);
 int get_redo_num(void);
 int get_hlink_num(void);
-void io_set_filesfrom_fds(int f_in, int f_out);
+void start_filesfrom_forwarding(int fd);
 int read_line(int fd, char *buf, size_t bufsiz, int flags);
 void read_args(int f_in, char *mod_name, char *buf, size_t bufsiz, int rl_nulls,
 	       char ***argv_p, int *argc_p, char **request_p);
-int io_start_buffering_out(int f_out);
-int io_start_buffering_in(int f_in);
-void io_end_buffering_in(void);
-void io_end_buffering_out(void);
+BOOL io_start_buffering_out(int f_out);
+BOOL io_start_buffering_in(int f_in);
+void io_end_buffering_in(BOOL free_buffers);
+void io_end_buffering_out(BOOL free_buffers);
 void maybe_flush_socket(int important);
-void maybe_send_keepalive(void);
-void start_flist_forward(int f_in);
+void maybe_send_keepalive(time_t now, int flags);
+void start_flist_forward(int ndx);
 void stop_flist_forward(void);
+void wait_for_receiver(void);
 unsigned short read_shortint(int f);
 int32 read_int(int f);
 int32 read_varint(int f);
@@ -157,7 +160,7 @@ uchar read_byte(int f);
 int read_vstring(int f, char *buf, int bufsize);
 void read_sum_head(int f, struct sum_struct *sum);
 void write_sum_head(int f, struct sum_struct *sum);
-int io_flush(int flush_it_all);
+void io_flush(int flush_it_all);
 void write_shortint(int f, unsigned short x);
 void write_int(int f, int32 x);
 void write_varint(int f, int32 x);
@@ -169,19 +172,19 @@ void write_byte(int f, uchar c);
 void write_vstring(int f, const char *str, int len);
 void write_ndx(int f, int32 ndx);
 int32 read_ndx(int f);
-int read_line_old(int f, char *buf, size_t bufsiz);
+int read_line_old(int fd, char *buf, size_t bufsiz, int eof_ok);
 void io_printf(int fd, const char *format, ...);
-void io_start_multiplex_out(void);
-void io_start_multiplex_in(void);
-int io_multiplex_write(enum msgcode code, const char *buf, size_t len, int convert);
-void io_end_multiplex_in(void);
-void io_end_multiplex_out(void);
+void io_start_multiplex_out(int fd);
+void io_start_multiplex_in(int fd);
+int io_end_multiplex_in(int mode);
+int io_end_multiplex_out(int mode);
 void start_write_batch(int fd);
 void stop_write_batch(void);
 char *lp_bind_address(void);
 char *lp_motd_file(void);
 char *lp_pid_file(void);
 char *lp_socket_options(void);
+int lp_listen_backlog(void);
 int lp_rsync_port(void);
 char *lp_auth_users(int module_id);
 char *lp_charset(int module_id);
@@ -213,18 +216,21 @@ int lp_max_verbosity(int module_id);
 int lp_syslog_facility(int module_id);
 int lp_timeout(int module_id);
 BOOL lp_fake_super(int module_id);
+BOOL lp_forward_lookup(int module_id);
 BOOL lp_ignore_errors(int module_id);
 BOOL lp_ignore_nonreadable(int module_id);
 BOOL lp_list(int module_id);
 BOOL lp_munge_symlinks(int module_id);
 BOOL lp_numeric_ids(int module_id);
 BOOL lp_read_only(int module_id);
+BOOL lp_reverse_lookup(int module_id);
 BOOL lp_strict_modes(int module_id);
 BOOL lp_transfer_logging(int module_id);
 BOOL lp_use_chroot(int module_id);
 BOOL lp_write_only(int module_id);
-BOOL lp_load(char *pszFname, int globals_only);
-int lp_numservices(void);
+int lp_load(char *pszFname, int globals_only);
+BOOL set_dparams(int syntax_check_only);
+int lp_num_modules(void);
 int lp_number(char *name);
 void log_init(int restart);
 void logfile_close(void);
@@ -233,14 +239,16 @@ void rwrite(enum logcode code, const char *buf, int le
 void rprintf(enum logcode code, const char *format, ...);
 void rsyserr(enum logcode code, int errcode, const char *format, ...);
 void rflush(enum logcode code);
+void remember_initial_stats(void);
 int log_format_has(const char *format, char esc);
-void log_item(enum logcode code, struct file_struct *file,
-	      struct stats *initial_stats, int iflags, const char *hlink);
+void log_item(enum logcode code, struct file_struct *file, int iflags, const char *hlink);
 void maybe_log_item(struct file_struct *file, int iflags, int itemizing,
 		    const char *buf);
 void log_delete(const char *fname, int mode);
 void log_exit(int code, const char *file, int line);
 pid_t wait_process(pid_t pid, int *status_ptr, int flags);
+void write_del_stats(int f);
+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[]);
@@ -249,12 +257,15 @@ 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);
 void match_report(void);
+void limit_output_verbosity(int level);
+void reset_output_levels(void);
+void negate_output_levels(void);
 void usage(enum logcode F);
 void option_error(void);
 int parse_arguments(int *argc_p, const char ***argv_p);
 void server_options(char **args, int *argc_p);
 char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr);
-BOOL pm_process( char *FileName,
+int pm_process( char *FileName,
                  BOOL (*sfunc)(char *),
                  BOOL (*pfunc)(char *, char *) );
 pid_t piped_child(char **command, int *f_in, int *f_out);
@@ -263,20 +274,20 @@ pid_t local_child(int argc, char **argv, int *f_in, in
 void set_current_file_index(struct file_struct *file, int ndx);
 void end_progress(OFF_T size);
 void show_progress(OFF_T ofs, OFF_T size);
-int get_tmpname(char *fnametmp, const char *fname);
+int get_tmpname(char *fnametmp, const char *fname, BOOL make_unique);
 int open_tmpfile(char *fnametmp, const char *fname, struct file_struct *file);
-int recv_files(int f_in, char *local_name);
+int recv_files(int f_in, int f_out, char *local_name);
 void setup_iconv(void);
 int iconvbufs(iconv_t ic, xbuf *in, xbuf *out, int flags);
 void send_protected_args(int fd, char *args[]);
-int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
+int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
 		       char *buf, int *len_ptr);
 void free_sums(struct sum_struct *s);
 mode_t dest_mode(mode_t flist_mode, mode_t stat_mode, int dflt_perms,
 		 int exists);
 int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
 		   const char *fnamecmp, int flags);
-RETSIGTYPE sig_int(UNUSED(int val));
+RETSIGTYPE 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,
@@ -295,7 +306,8 @@ int is_a_socket(int fd);
 void start_accept_loop(int port, int (*fn)(int, int));
 void set_socket_options(int fd, char *options);
 int do_unlink(const char *fname);
-int do_symlink(const char *fname1, const char *fname2);
+int do_symlink(const char *lnk, const char *fname);
+ssize_t do_readlink(const char *path, char *buf, size_t bufsiz);
 int do_link(const char *fname1, const char *fname2);
 int do_lchown(const char *path, uid_t owner, gid_t group);
 int do_mknod(const char *pathname, mode_t mode, dev_t dev);
@@ -315,11 +327,17 @@ int do_utimensat(const char *fname, time_t modtime, ui
 int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec);
 int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec);
 int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec));
+int do_fallocate(int fd, OFF_T offset, OFF_T length);
+int do_open_nofollow(const char *pathname, int flags);
 void set_compression(const char *fname);
 void send_token(int f, int32 token, struct map_struct *buf, OFF_T offset,
 		int32 n, int32 toklen);
 int32 recv_token(int f, char **data);
 void see_token(char *data, int32 toklen);
+char *uid_to_user(uid_t uid);
+char *gid_to_group(gid_t gid);
+int user_to_uid(const char *name, uid_t *uid_p, BOOL num_ok);
+int group_to_gid(const char *name, gid_t *gid_p, BOOL num_ok);
 uid_t match_uid(uid_t uid);
 gid_t match_gid(gid_t gid, uint16 *flags_ptr);
 const char *add_uid(uid_t uid);
@@ -328,25 +346,21 @@ void send_id_list(int f);
 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);
 void set_nonblocking(int fd);
 void set_blocking(int fd);
 int fd_pair(int fd[2]);
 void print_child_argv(const char *prefix, char **cmd);
-NORETURN void out_of_memory(const char *str);
-NORETURN void overflow_exit(const char *str);
-int set_modtime(const char *fname, time_t modtime, mode_t mode);
-int mkdir_defmode(char *fname);
-int create_directory_path(char *fname);
+int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode);
+int make_path(char *fname, int flags);
 int full_write(int desc, const char *ptr, size_t len);
-int copy_file(const char *source, const char *dest, int ofd,
-	      mode_t mode, int create_bak_dir);
+int copy_file(const char *source, const char *dest, int ofd, mode_t mode);
 int robust_unlink(const char *fname);
 int robust_rename(const char *from, const char *to, const char *partialptr,
 		  int mode);
 pid_t do_fork(void);
 void kill_all(int sig);
-int name_to_uid(const char *name, uid_t *uid_p);
-int name_to_gid(const char *name, gid_t *gid_p);
 int lock_range(int fd, int offset, int len);
 int glob_expand(const char *arg, char ***argv_p, int *argc_p, int *maxargs_p);
 void glob_expand_module(char *base1, char *arg, char ***argv_p, int *argc_p, int *maxargs_p);
@@ -363,16 +377,11 @@ char *full_fname(const char *fn);
 char *partial_dir_fname(const char *fname);
 int handle_partial_dir(const char *fname, int create);
 int unsafe_symlink(const char *dest, const char *src);
-char *human_num(int64 num);
-char *human_dnum(double dnum, int decimal_digits);
 char *timestring(time_t t);
-int msleep(int t);
 int cmp_time(time_t file1, time_t file2);
 int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6);
-void *_new_array(unsigned long num, unsigned int size, int use_calloc);
-void *_realloc_array(void *ptr, unsigned int size, size_t num);
 const char *find_filename_suffix(const char *fn, int fn_len, int *len_ptr);
-uint32 fuzzy_distance(const char *s1, int len1, const char *s2, int len2);
+uint32 fuzzy_distance(const char *s1, unsigned len1, const char *s2, unsigned len2);
 struct bitbag *bitbag_create(int max_ndx);
 void bitbag_set_bit(struct bitbag *bb, int ndx);
 void bitbag_clear_bit(struct bitbag *bb, int ndx);
@@ -382,6 +391,12 @@ void flist_ndx_push(flist_ndx_list *lp, int ndx);
 int flist_ndx_pop(flist_ndx_list *lp);
 void *expand_item_list(item_list *lp, size_t item_size,
 		       const char *desc, int incr);
+int msleep(int t);
+void *_new_array(unsigned long num, unsigned int size, int use_calloc);
+void *_realloc_array(void *ptr, unsigned int size, size_t num);
+const char *sum_as_hex(const char *sum);
+NORETURN void out_of_memory(const char *str);
+NORETURN void overflow_exit(const char *str);
 void free_xattr(stat_x *sxp);
 int get_xattr(const char *fname, stat_x *sxp);
 int copy_xattrs(const char *source, const char *dest);
@@ -403,3 +418,5 @@ int x_stat(const char *fname, STRUCT_STAT *fst, STRUCT
 int x_lstat(const char *fname, STRUCT_STAT *fst, STRUCT_STAT *xst);
 int x_fstat(int fd, STRUCT_STAT *fst, STRUCT_STAT *xst);
 int sys_gettimeofday(struct timeval *tv);
+char *do_big_num(int64 num, int human_flag, const char *fract);
+char *do_big_dnum(double dnum, int human_flag, int decimal_digits);