Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use `id -G` rather than `groups` to get a list of groups for this
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
3b70b4e
..
55c48a1
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-1,6
+1,7
@@
-/*
- Copyright (C) Andrew Tridgell 1996
- Copyright (C) Paul Mackerras 1996
+/* -*- c-file-style: "linux" -*-
+
+ Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
+ Copyright (C) 1996 by Paul Mackerras
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
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
@@
-30,7
+31,7
@@
extern int delete_mode;
static struct exclude_struct **exclude_list;
/* build an exclude structure given a exclude pattern */
static struct exclude_struct **exclude_list;
/* build an exclude structure given a exclude pattern */
-static struct exclude_struct *make_exclude(char *pattern, int include)
+static struct exclude_struct *make_exclude(c
onst c
har *pattern, int include)
{
struct exclude_struct *ret;
{
struct exclude_struct *ret;
@@
-166,7
+167,7
@@
int check_exclude(char *name, struct exclude_struct **local_exclude_list,
if (local_exclude_list) {
for (n=0; local_exclude_list[n]; n++) {
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;
if (check_one_exclude(name, ent, st)) {
report_exclude_result(name, ent, st);
return !ent->include;
@@
-178,7
+179,7
@@
int check_exclude(char *name, struct exclude_struct **local_exclude_list,
}
}
-void add_exclude_list(c
har *pattern,
struct exclude_struct ***list, int include)
+void add_exclude_list(c
onst char *pattern,
struct exclude_struct ***list, int include)
{
int len=0;
if (list && *list)
{
int len=0;
if (list && *list)
@@
-200,18
+201,20
@@
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 (!*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;
}
(*list)[len+1] = NULL;
}
-void add_exclude(char *pattern, int include)
+void add_exclude(c
onst c
har *pattern, int include)
{
add_exclude_list(pattern,&exclude_list, include);
}
{
add_exclude_list(pattern,&exclude_list, include);
}
-struct exclude_struct **make_exclude_list(char *fname,
+struct exclude_struct **make_exclude_list(c
onst c
har *fname,
struct exclude_struct **list1,
int fatal, int include)
{
struct exclude_struct **list1,
int fatal, int include)
{
@@
-220,7
+223,10
@@
struct exclude_struct **make_exclude_list(char *fname,
char line[MAXPATHLEN];
if (!f) {
if (fatal) {
char line[MAXPATHLEN];
if (!f) {
if (fatal) {
- rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
+ rsyserr(FERROR, errno,
+ "failed to open %s file %s",
+ include ? "include" : "exclude",
+ fname);
exit_cleanup(RERR_FILEIO);
}
return list;
exit_cleanup(RERR_FILEIO);
}
return list;
@@
-242,7
+248,7
@@
struct exclude_struct **make_exclude_list(char *fname,
}
}
-void add_exclude_file(c
har *fname,int fatal,
int include)
+void add_exclude_file(c
onst char *fname, int fatal,
int include)
{
if (!fname || !*fname) return;
{
if (!fname || !*fname) return;
@@
-256,7
+262,10
@@
void send_exclude_list(int f)
extern int remote_version;
extern int list_only, recurse;
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);
}
if (list_only && !recurse) {
add_exclude("/*/*", 0);
}
@@
-295,7
+304,8
@@
void send_exclude_list(int f)
void recv_exclude_list(int f)
{
char line[MAXPATHLEN];
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);
while ((l=read_int(f))) {
if (l >= MAXPATHLEN) overflow("recv_exclude_list");
read_sbuf(f,line,l);
@@
-394,7
+404,7
@@
void add_cvs_excludes(void)
add_exclude(cvs_ignore_list[i], 0);
if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
add_exclude(cvs_ignore_list[i], 0);
if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
- s
l
printf(fname,sizeof(fname), "%s/.cvsignore",p);
+ s
n
printf(fname,sizeof(fname), "%s/.cvsignore",p);
add_exclude_file(fname,0,0);
}
add_exclude_file(fname,0,0);
}