X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a039749b4c21e3439dc06fcdd5355828f1f95463..536b84680b4ab1f29fa456b4fa7b5b16eff4af8f:/exclude.c diff --git a/exclude.c b/exclude.c index cbf6105f..848d5613 100644 --- a/exclude.c +++ b/exclude.c @@ -1,21 +1,23 @@ -/* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ +/* -*- c-file-style: "linux" -*- + * + * Copyright (C) 1996-2001 by Andrew Tridgell + * Copyright (C) 1996 by Paul Mackerras + * Copyright (C) 2002 by Martin Pool + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ /* a lot of this stuff was originally derived from GNU tar, although it has now changed so much that it is hard to tell :) */ @@ -29,8 +31,8 @@ extern int delete_mode; static struct exclude_struct **exclude_list; -/* build an exclude structure given a exclude pattern */ -static struct exclude_struct *make_exclude(char *pattern, int include) +/** Build an exclude structure given a exclude pattern */ +static struct exclude_struct *make_exclude(const char *pattern, int include) { struct exclude_struct *ret; @@ -166,7 +168,7 @@ int check_exclude(char *name, struct exclude_struct **local_exclude_list, if (local_exclude_list) { for (n=0; local_exclude_list[n]; n++) { - ent = exclude_list[n]; + ent = local_exclude_list[n]; if (check_one_exclude(name, ent, st)) { report_exclude_result(name, ent, st); return !ent->include; @@ -178,7 +180,7 @@ int check_exclude(char *name, struct exclude_struct **local_exclude_list, } -void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) +void add_exclude_list(const char *pattern, struct exclude_struct ***list, int include) { int len=0; if (list && *list) @@ -200,24 +202,32 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) 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,%s)\n",pattern, + include ? "include" : "exclude"); + } + (*list)[len+1] = NULL; } -void add_exclude(char *pattern, int include) +void add_exclude(const char *pattern, int include) { add_exclude_list(pattern,&exclude_list, include); } -struct exclude_struct **make_exclude_list(char *fname, +struct exclude_struct **make_exclude_list(const char *fname, struct exclude_struct **list1, int fatal, int include) { struct exclude_struct **list=list1; - FILE *f = fopen(fname,"r"); + FILE *f; char line[MAXPATHLEN]; + + if (strcmp(fname, "-")) { + f = fopen(fname,"r" O_TEXT_STR); + } else { + f = fdopen(0, "r" O_TEXT_STR); + } if (!f) { if (fatal) { rsyserr(FERROR, errno, @@ -245,7 +255,7 @@ struct exclude_struct **make_exclude_list(char *fname, } -void add_exclude_file(char *fname,int fatal,int include) +void add_exclude_file(const char *fname, int fatal, int include) { if (!fname || !*fname) return; @@ -259,7 +269,10 @@ void send_exclude_list(int f) extern int remote_version; extern int list_only, recurse; - /* this is a complete hack - blame Rusty */ + /* This is a complete hack - blame Rusty. + * + * FIXME: This pattern shows up in the output of + * report_exclude_result(), which is not ideal. */ if (list_only && !recurse) { add_exclude("/*/*", 0); } @@ -298,7 +311,8 @@ void send_exclude_list(int f) void recv_exclude_list(int f) { char line[MAXPATHLEN]; - int l; + unsigned int l; + while ((l=read_int(f))) { if (l >= MAXPATHLEN) overflow("recv_exclude_list"); read_sbuf(f,line,l); @@ -327,7 +341,7 @@ char *get_exclude_tok(char *p) return(NULL); /* Skip over any initial spaces */ - while(isspace(*s)) + while (isspace(* (unsigned char *) s)) s++; /* Are we at the end of the string? */ @@ -340,7 +354,7 @@ char *get_exclude_tok(char *p) s+=2; /* Skip to the next space or the end of the string */ - while(!isspace(*s) && *s!='\0') + while (!isspace(* (unsigned char *) s) && *s != '\0') s++; } else { t=NULL; @@ -379,12 +393,11 @@ void add_include_line(char *p) static char *cvs_ignore_list[] = { - "RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*", - "tags","TAGS",".make.state",".nse_depinfo", - "*~", "#*", ".#*", ",*", "*.old", "*.bak", "*.BAK", "*.orig", + "RCS/", "SCCS/", "CVS/", ".svn/", "CVS.adm", "RCSLOG", "cvslog.*", + "tags", "TAGS", ".make.state", ".nse_depinfo", + "*~", "#*", ".#*", ", *", "*.old", "*.bak", "*.BAK", "*.orig", "*.rej", ".del-*", "*.a", "*.o", "*.obj", "*.so", "*.Z", "*.elc", "*.ln", - "core",NULL}; - + "core", NULL}; void add_cvs_excludes(void) @@ -397,7 +410,7 @@ void add_cvs_excludes(void) add_exclude(cvs_ignore_list[i], 0); if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) { - slprintf(fname,sizeof(fname), "%s/.cvsignore",p); + snprintf(fname,sizeof(fname), "%s/.cvsignore",p); add_exclude_file(fname,0,0); }