extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
-extern struct exclude_struct **server_exclude_list;
+extern struct exclude_list_struct server_exclude_list;
extern char *exclude_path_prefix;
extern char *config_file;
*p = 0;
}
- if (verbose >= 2) {
- /* FIXME: If we're going to use a socket program for
- * testing, then this message is wrong. We need to
- * say something like "(except really using %s)" */
- rprintf(FINFO, "opening tcp connection to %s port %d\n",
- host, rsync_port);
- }
fd = open_socket_out_wrapped(host, rsync_port, bind_address,
default_af_hint);
- if (fd == -1) {
+ if (fd == -1)
exit_cleanup(RERR_SOCKETIO);
- }
ret = start_inband_exchange(user, path, fd, fd, argc);
exclude_path_prefix = "";
p = lp_include_from(i);
- add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_INCLUDE);
+ add_exclude_file(&server_exclude_list, p,
+ XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
p = lp_include(i);
- add_exclude_line(&server_exclude_list, p, ADD_INCLUDE);
+ add_exclude(&server_exclude_list, p,
+ XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
p = lp_exclude_from(i);
- add_exclude_file(&server_exclude_list, p, MISSING_FATAL, ADD_EXCLUDE);
+ add_exclude_file(&server_exclude_list, p,
+ XFLG_FATAL_ERRORS);
p = lp_exclude(i);
- add_exclude_line(&server_exclude_list, p, ADD_EXCLUDE);
+ add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
exclude_path_prefix = NULL;