Skip to content

L
liblongpath-rsync
Commit 2b6b4d53 authored by Andrew Tridgell's avatar Andrew Tridgell
Browse files
Options

added support for --include, --include-from and the +/- syntax

parent 35f69d8a
Hide whitespace changes
Inline Side-by-side
Showing with 244 additions and 135 deletions
clientserver.c
View file @ 2b6b4d53
...@@ -174,7 +174,7 @@ static int rsync_module(int fd, int i) ...@@ -174,7 +174,7 @@ static int rsync_module(int fd, int i)
} }
p = lp_exclude_from(i); p = lp_exclude_from(i);
add_exclude_file(p, 1); add_exclude_file(p, 1, 0);
p = lp_exclude(i); p = lp_exclude(i);
add_exclude_line(p); add_exclude_line(p);
......
configure.in
View file @ 2b6b4d53
...@@ -41,7 +41,7 @@ AC_FUNC_MEMCMP ...@@ -41,7 +41,7 @@ AC_FUNC_MEMCMP
AC_FUNC_UTIME_NULL AC_FUNC_UTIME_NULL
AC_CHECK_FUNCS(mmap munmap waitpid getcwd strdup strerror chown chmod mknod) AC_CHECK_FUNCS(mmap munmap waitpid getcwd strdup strerror chown chmod mknod)
AC_CHECK_FUNCS(fchmod fstat strchr bcopy bzero readlink link utime utimes) AC_CHECK_FUNCS(fchmod fstat strchr bcopy bzero readlink link utime utimes)
AC_CHECK_FUNCS(memmove getopt_long lchown setlinebuf vsnprintf setsid glob) AC_CHECK_FUNCS(memmove getopt_long lchown setlinebuf vsnprintf setsid glob strpbrk)
echo $ac_n "checking for working fnmatch... $ac_c" echo $ac_n "checking for working fnmatch... $ac_c"
AC_TRY_RUN([#include <fnmatch.h> AC_TRY_RUN([#include <fnmatch.h>
......
exclude.c
View file @ 2b6b4d53
...@@ -17,160 +17,233 @@ ...@@ -17,160 +17,233 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* /* a lot of this stuff was originally derived from GNU tar, although
a lot of this stuff was derived from GNU tar it has now changed so much that it is hard to tell :) */
*/
#include "rsync.h" #include "rsync.h"
extern int verbose; extern int verbose;
static char **exclude_list; static struct exclude_struct **exclude_list;
static int is_regex(char *str) /* build an exclude structure given a exclude pattern */
static struct exclude_struct *make_exclude(char *pattern, int include)
{ {
return strchr(str, '*') || strchr(str, '[') || strchr(str, '?'); struct exclude_struct *ret;
}
ret = (struct exclude_struct *)malloc(sizeof(*ret));
if (!ret) out_of_memory("make_exclude");
static int check_one_exclude(char *name,char *pattern) memset(ret, 0, sizeof(*ret));
{
char *p; ret->orig = strdup(pattern);
if (strncmp(pattern,"- ",2) == 0) {
pattern += 2;
} else if (strncmp(pattern,"+ ",2) == 0) {
ret->include = 1;
pattern += 2;
} else {
ret->include = include;
}
ret->pattern = strdup(pattern);
if (!ret->orig || !ret->pattern) out_of_memory("make_exclude");
if (!strchr(pattern,'/') && (p=strrchr(name,'/'))) if (strpbrk(pattern, "*[?")) ret->regular_exp = 1;
name = p+1;
if (!name[0]) return 0; if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
ret->pattern[strlen(pattern)-1] = 0;
ret->directory = 1;
}
if (*pattern == '/' && *name != '/') pattern++; if (!strchr(ret->pattern,'/')) {
ret->local = 1;
}
if (is_regex(pattern)) { return ret;
if (fnmatch(pattern, name, 0) == 0) }
return 1;
} else { static void free_exclude(struct exclude_struct *ex)
int l1 = strlen(name); {
int l2 = strlen(pattern); free(ex->orig);
if (l2 <= l1 && free(ex->pattern);
strcmp(name+(l1-l2),pattern) == 0 && memset(ex,0,sizeof(*ex));
(l1==l2 || name[l1-(l2+1)] == '/')) free(ex);
return 1; }
}
return 0; static int check_one_exclude(char *name,struct exclude_struct *ex,
STRUCT_STAT *st)
{
char *p;
int match_start=0;
char *pattern = ex->pattern;
if (ex->local && (p=strrchr(name,'/')))
name = p+1;
if (!name[0]) return 0;
if (ex->directory && !S_ISDIR(st->st_mode)) return 0;
if (*pattern == '/' && *name != '/') {
match_start = 1;
pattern++;
}
if (ex->regular_exp) {
if (fnmatch(ex->pattern, name, 0) == 0)
return 1;
} else {
int l1 = strlen(name);
int l2 = strlen(ex->pattern);
if (l2 <= l1 &&
strcmp(name+(l1-l2),ex->pattern) == 0 &&
(l1==l2 || (!match_start && name[l1-(l2+1)] == '/')))
return 1;
}
return 0;
} }
int check_exclude(char *name,char **local_exclude_list) int check_exclude(char *name,struct exclude_struct **local_exclude_list,
STRUCT_STAT *st)
{ {
int n; int n;
if (exclude_list) { if (exclude_list) {
for (n=0; exclude_list[n]; n++) for (n=0; exclude_list[n]; n++)
if (check_one_exclude(name,exclude_list[n])) if (check_one_exclude(name,exclude_list[n],st))
return 1; return !exclude_list[n]->include;
} }
if (local_exclude_list) { if (local_exclude_list) {
for (n=0; local_exclude_list[n]; n++) for (n=0; local_exclude_list[n]; n++)
if (check_one_exclude(name,local_exclude_list[n])) if (check_one_exclude(name,local_exclude_list[n],st))
return 1; return !local_exclude_list[n]->include;
} }
return 0; return 0;
} }
void add_exclude_list(char *pattern,char ***list) void add_exclude_list(char *pattern,struct exclude_struct ***list, int include)
{ {
int len=0; int len=0;
if (list && *list) if (list && *list)
for (; (*list)[len]; len++) ; for (; (*list)[len]; len++) ;
if (strcmp(pattern,"!") == 0) { if (strcmp(pattern,"!") == 0) {
if (verbose > 2) if (verbose > 2)
rprintf(FINFO,"clearing exclude list\n"); rprintf(FINFO,"clearing exclude list\n");
while ((len)--) while ((len)--) {
free((*list)[len]); free_exclude((*list)[len]);
free((*list)); }
*list = NULL; free((*list));
return; *list = NULL;
} return;
}
if (!*list) {
*list = (char **)malloc(sizeof(char *)*2); if (!*list) {
} else { *list = (struct exclude_struct **)malloc(sizeof(struct exclude_struct *)*2);
*list = (char **)realloc(*list,sizeof(char *)*(len+2)); } else {
} *list = (struct exclude_struct **)realloc(*list,sizeof(struct exclude_struct *)*(len+2));
}
if (!*list || !((*list)[len] = strdup(pattern)))
out_of_memory("add_exclude"); if (!*list || !((*list)[len] = make_exclude(pattern, include)))
out_of_memory("add_exclude");
if (verbose > 2)
rprintf(FINFO,"add_exclude(%s)\n",pattern); if (verbose > 2)
rprintf(FINFO,"add_exclude(%s)\n",pattern);
(*list)[len+1] = NULL;
(*list)[len+1] = NULL;
} }
void add_exclude(char *pattern) void add_exclude(char *pattern, int include)
{ {
add_exclude_list(pattern,&exclude_list); add_exclude_list(pattern,&exclude_list, include);
} }
char **make_exclude_list(char *fname,char **list1,int fatal) struct exclude_struct **make_exclude_list(char *fname,
struct exclude_struct **list1,
int fatal, int include)
{ {
char **list=list1; struct exclude_struct **list=list1;
FILE *f = fopen(fname,"r"); FILE *f = fopen(fname,"r");
char line[MAXPATHLEN]; char line[MAXPATHLEN];
if (!f) { if (!f) {
if (fatal) { if (fatal) {
rprintf(FERROR,"%s : %s\n",fname,strerror(errno)); rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
exit_cleanup(1); exit_cleanup(1);
} }
return list; return list;
} }
while (fgets(line,MAXPATHLEN,f)) { while (fgets(line,MAXPATHLEN,f)) {
int l = strlen(line); int l = strlen(line);
if (l && line[l-1] == '\n') l--; if (l && line[l-1] == '\n') l--;
line[l] = 0; line[l] = 0;
if (line[0]) add_exclude_list(line,&list); if (line[0]) add_exclude_list(line,&list,include);
} }
fclose(f); fclose(f);
return list; return list;
} }
void add_exclude_file(char *fname,int fatal) void add_exclude_file(char *fname,int fatal,int include)
{ {
if (!fname || !*fname) return; if (!fname || !*fname) return;
exclude_list = make_exclude_list(fname,exclude_list,fatal); exclude_list = make_exclude_list(fname,exclude_list,fatal,include);
} }
void send_exclude_list(int f) void send_exclude_list(int f)
{ {
int i; int i;
if (exclude_list) extern int remote_version;
for (i=0;exclude_list[i];i++) {
int l = strlen(exclude_list[i]); if (!exclude_list) {
if (l == 0) continue; write_int(f,0);
write_int(f,l); return;
write_buf(f,exclude_list[i],l); }
}
write_int(f,0); for (i=0;exclude_list[i];i++) {
char *pattern = exclude_list[i]->orig;
int l;
if (remote_version < 19) {
if (strncmp(pattern,"+ ", 2)==0) {
rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
exit_cleanup(1);
}
if (strncmp(pattern,"- ", 2) == 0) {
pattern += 2;
}
}
l = strlen(pattern);
if (l == 0) continue;
write_int(f,l);
write_buf(f,pattern,l);
}
write_int(f,0);
} }
void recv_exclude_list(int f) void recv_exclude_list(int f)
{ {
char line[MAXPATHLEN]; char line[MAXPATHLEN];
int l; int l;
while ((l=read_int(f))) { while ((l=read_int(f))) {
if (l >= MAXPATHLEN) overflow("recv_exclude_list"); if (l >= MAXPATHLEN) overflow("recv_exclude_list");
read_sbuf(f,line,l); read_sbuf(f,line,l);
add_exclude(line); add_exclude(line,0);
} }
} }
...@@ -181,7 +254,7 @@ void add_exclude_line(char *p) ...@@ -181,7 +254,7 @@ void add_exclude_line(char *p)
p = strdup(p); p = strdup(p);
if (!p) out_of_memory("add_exclude_line"); if (!p) out_of_memory("add_exclude_line");
for (tok=strtok(p," "); tok; tok=strtok(NULL," ")) for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
add_exclude(tok); add_exclude(tok, 0);
free(p); free(p);
} }
...@@ -197,17 +270,17 @@ static char *cvs_ignore_list[] = { ...@@ -197,17 +270,17 @@ static char *cvs_ignore_list[] = {
void add_cvs_excludes(void) void add_cvs_excludes(void)
{ {
char fname[MAXPATHLEN]; char fname[MAXPATHLEN];
char *p; char *p;
int i; int i;
for (i=0; cvs_ignore_list[i]; i++) for (i=0; cvs_ignore_list[i]; i++)
add_exclude(cvs_ignore_list[i]); add_exclude(cvs_ignore_list[i], 0);
if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) { if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
slprintf(fname,sizeof(fname)-1, "%s/.cvsignore",p); slprintf(fname,sizeof(fname)-1, "%s/.cvsignore",p);
add_exclude_file(fname,0); add_exclude_file(fname,0,0);
} }
add_exclude_line(getenv("CVSIGNORE")); add_exclude_line(getenv("CVSIGNORE"));
} }
flist.c
View file @ 2b6b4d53
...@@ -46,7 +46,7 @@ extern int copy_links; ...@@ -46,7 +46,7 @@ extern int copy_links;
extern int remote_version; extern int remote_version;
extern int io_error; extern int io_error;
static char **local_exclude_list; static struct exclude_struct **local_exclude_list;
int link_stat(const char *Path, STRUCT_STAT *Buffer) int link_stat(const char *Path, STRUCT_STAT *Buffer)
{ {
...@@ -67,7 +67,7 @@ int link_stat(const char *Path, STRUCT_STAT *Buffer) ...@@ -67,7 +67,7 @@ int link_stat(const char *Path, STRUCT_STAT *Buffer)
*/ */
static int match_file_name(char *fname,STRUCT_STAT *st) static int match_file_name(char *fname,STRUCT_STAT *st)
{ {
if (check_exclude(fname,local_exclude_list)) { if (check_exclude(fname,local_exclude_list,st)) {
if (verbose > 2) if (verbose > 2)
rprintf(FINFO,"excluding file %s\n",fname); rprintf(FINFO,"excluding file %s\n",fname);
return 0; return 0;
...@@ -493,10 +493,10 @@ static void send_file_name(int f,struct file_list *flist,char *fname, ...@@ -493,10 +493,10 @@ static void send_file_name(int f,struct file_list *flist,char *fname,
} }
if (S_ISDIR(file->mode) && recursive) { if (S_ISDIR(file->mode) && recursive) {
char **last_exclude_list = local_exclude_list; struct exclude_struct **last_exclude_list = local_exclude_list;
send_directory(f,flist,f_name(file)); send_directory(f,flist,f_name(file));
local_exclude_list = last_exclude_list; local_exclude_list = last_exclude_list;
return; return;
} }
} }
...@@ -535,7 +535,7 @@ static void send_directory(int f,struct file_list *flist,char *dir) ...@@ -535,7 +535,7 @@ static void send_directory(int f,struct file_list *flist,char *dir)
if (cvs_exclude) { if (cvs_exclude) {
if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) { if (strlen(fname) + strlen(".cvsignore") <= MAXPATHLEN-1) {
strcpy(p,".cvsignore"); strcpy(p,".cvsignore");
local_exclude_list = make_exclude_list(fname,NULL,0); local_exclude_list = make_exclude_list(fname,NULL,0,0);
} else { } else {
io_error = 1; io_error = 1;
rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname); rprintf(FINFO,"cannot cvs-exclude in long-named directory %s\n",fname);
......
lib/compat.c
View file @ 2b6b4d53
...@@ -58,3 +58,21 @@ void *memmove(void *dest, const void *src, size_t n) ...@@ -58,3 +58,21 @@ void *memmove(void *dest, const void *src, size_t n)
return dest; return dest;
} }
#endif #endif
#ifndef HAVE_STRPBRK
/* Find the first ocurrence in S of any character in ACCEPT.
derived from glibc
*/
char *strpbrk(const char *s, const char *accept)
{
while (*s != '\0') {
const char *a = accept;
while (*a != '\0') {
if (*a++ == *s) return (char *)s;
}
++s;
}
return NULL;
}
#endif
options.c
View file @ 2b6b4d53
...@@ -109,6 +109,8 @@ void usage(int F) ...@@ -109,6 +109,8 @@ void usage(int F)
rprintf(F,"-z, --compress compress file data\n"); rprintf(F,"-z, --compress compress file data\n");
rprintf(F," --exclude FILE exclude file FILE\n"); rprintf(F," --exclude FILE exclude file FILE\n");
rprintf(F," --exclude-from FILE exclude files listed in FILE\n"); rprintf(F," --exclude-from FILE exclude files listed in FILE\n");
rprintf(F," --include FILE don't exclude file FILE\n");
rprintf(F," --include-from FILE don't exclude files listed in FILE\n");
rprintf(F," --suffix SUFFIX override backup suffix\n"); rprintf(F," --suffix SUFFIX override backup suffix\n");
rprintf(F," --version print version number\n"); rprintf(F," --version print version number\n");
rprintf(F," --daemon run as a rsync daemon\n"); rprintf(F," --daemon run as a rsync daemon\n");
...@@ -122,7 +124,8 @@ void usage(int F) ...@@ -122,7 +124,8 @@ void usage(int F)
enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE, enum {OPT_VERSION,OPT_SUFFIX,OPT_SENDER,OPT_SERVER,OPT_EXCLUDE,
OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH, OPT_EXCLUDE_FROM,OPT_DELETE,OPT_NUMERIC_IDS,OPT_RSYNC_PATH,
OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON,OPT_CONFIG,OPT_PORT}; OPT_FORCE,OPT_TIMEOUT,OPT_DAEMON,OPT_CONFIG,OPT_PORT,
OPT_INCLUDE, OPT_INCLUDE_FROM};
static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T:z"; static char *short_options = "oblLWHpguDCtcahvrRIxnSe:B:T:z";
...@@ -135,6 +138,8 @@ static struct option long_options[] = { ...@@ -135,6 +138,8 @@ static struct option long_options[] = {
{"numeric-ids", 0, 0, OPT_NUMERIC_IDS}, {"numeric-ids", 0, 0, OPT_NUMERIC_IDS},
{"exclude", 1, 0, OPT_EXCLUDE}, {"exclude", 1, 0, OPT_EXCLUDE},
{"exclude-from",1, 0, OPT_EXCLUDE_FROM}, {"exclude-from",1, 0, OPT_EXCLUDE_FROM},
{"include", 1, 0, OPT_INCLUDE},
{"include-from",1, 0, OPT_INCLUDE_FROM},
{"rsync-path", 1, 0, OPT_RSYNC_PATH}, {"rsync-path", 1, 0, OPT_RSYNC_PATH},
{"one-file-system",0, 0, 'x'}, {"one-file-system",0, 0, 'x'},
{"ignore-times",0, 0, 'I'}, {"ignore-times",0, 0, 'I'},
...@@ -213,11 +218,19 @@ void parse_arguments(int argc, char *argv[]) ...@@ -213,11 +218,19 @@ void parse_arguments(int argc, char *argv[])
break; break;
case OPT_EXCLUDE: case OPT_EXCLUDE:
add_exclude(optarg); add_exclude(optarg, 0);
break;
case OPT_INCLUDE:
add_exclude(optarg, 1);
break; break;
case OPT_EXCLUDE_FROM: case OPT_EXCLUDE_FROM:
add_exclude_file(optarg,1); add_exclude_file(optarg,1, 0);
break;
case OPT_INCLUDE_FROM:
add_exclude_file(optarg,1, 1);
break; break;
case 'h': case 'h':
......
rsync.h
View file @ 2b6b4d53
...@@ -309,6 +309,16 @@ struct map_struct { ...@@ -309,6 +309,16 @@ struct map_struct {
OFF_T size, p_offset; OFF_T size, p_offset;
}; };
struct exclude_struct {
char *orig;
char *pattern;
int regular_exp;
int include;
int directory;
int local;
};
/* we need this function because of the silly way in which duplicate /* we need this function because of the silly way in which duplicate
entries are handled in the file lists - we can't change this entries are handled in the file lists - we can't change this
without breaking existing versions */ without breaking existing versions */
......
zlib/zutil.c
View file @ 2b6b4d53
...@@ -200,11 +200,6 @@ void zcfree (voidpf opaque, voidpf ptr) ...@@ -200,11 +200,6 @@ void zcfree (voidpf opaque, voidpf ptr)
#ifndef MY_ZCALLOC /* Any system without a special alloc function */ #ifndef MY_ZCALLOC /* Any system without a special alloc function */
#ifndef STDC
extern voidp calloc OF((uInt items, uInt size));
extern void free OF((voidpf ptr));
#endif
voidpf zcalloc (opaque, items, size) voidpf zcalloc (opaque, items, size)
voidpf opaque; voidpf opaque;
unsigned items; unsigned items;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment