mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-02-24 02:16:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some exclude changes for the new --filter option, including:

Browse Source 
- Added module_dirlen var.
- Call set_excludes_dir() instead of setting exclude_path_prefix.
- Use the newest XFLG_* options.
This commit is contained in:
Wayne Davison
2005-01-25 00:52:44 +00:00
parent f5a7b9e716
commit e7bf7c0161
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
clientserver.c
View File

@@ -49,12 +49,14 @@ extern int no_detach;
extern int default_af_hint;
extern char *bind_address;
extern struct exclude_list_struct server_exclude_list;
extern char *exclude_path_prefix;
extern char *config_file;
extern char *files_from;
char *auth_user;
/* Length of lp_path() string when in daemon mode & not chrooted, else 0. */
unsigned int module_dirlen = 0;
/**
* Run a client connected to an rsyncd. The alternative to this
* function for remote-shell connections is do_cmd().
@@ -310,26 +312,33 @@ static int rsync_module(int f_in, int f_out, int i)
/* TODO: Perhaps take a list of gids, and make them into the
* supplementary groups. */
exclude_path_prefix = use_chroot? "" : lp_path(i);
if (*exclude_path_prefix == '/' && !exclude_path_prefix[1])
exclude_path_prefix = "";
if (use_chroot) {
module_dirlen = 0;
set_excludes_dir("/", 1);
} else {
module_dirlen = strlen(lp_path(i));
set_excludes_dir(lp_path(i), module_dirlen);
}
p = lp_filter(i);
add_exclude(&server_exclude_list, p,
XFLG_WORD_SPLIT | XFLG_ABS_PATH);
p = lp_include_from(i);
add_exclude_file(&server_exclude_list, p,
XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
p = lp_include(i);
add_exclude(&server_exclude_list, p,
XFLG_WORD_SPLIT | XFLG_DEF_INCLUDE);
XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE);
p = lp_exclude_from(i);
add_exclude_file(&server_exclude_list, p,
XFLG_FATAL_ERRORS);
XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
p = lp_exclude(i);
add_exclude(&server_exclude_list, p, XFLG_WORD_SPLIT);
exclude_path_prefix = NULL;
add_exclude(&server_exclude_list, p,
XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE);
log_init();