struct exclude_struct **list = *listp;
if (verbose > 2)
- rprintf(FINFO,"clearing exclude list\n");
+ rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
if (!list)
return;
static char full_name[MAXPATHLEN];
extern char curr_dir[];
int plus = curr_dir[1] == '\0'? 1 : 0;
- snprintf(full_name, sizeof full_name,
- "%s/%s", curr_dir+plus, name);
+ pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
name = full_name;
}
* then it is stripped out by make_exclude. So as a special
* case we add it back in here. */
- if (verbose >= 2)
- rprintf(FINFO, "%s %s %s because of pattern %s%s\n",
+ if (verbose >= 2) {
+ rprintf(FINFO, "[%s] %s %s %s because of pattern %s%s\n",
+ who_am_i(),
ent->include ? "including" : "excluding",
name_is_dir ? "directory" : "file",
name, ent->pattern,
ent->directory ? "/" : "");
+ }
}
int len = 0;
if (*pattern == '!' && !pattern[1]) {
- free_exclude_list(listp);
- return;
+ free_exclude_list(listp);
+ return;
}
if (list)
out_of_memory("add_exclude");
if (verbose > 2) {
- rprintf(FINFO,"add_exclude(%s,%s)\n",pattern,
+ rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
+ who_am_i(), pattern,
include ? "include" : "exclude");
}
void add_exclude_file(struct exclude_struct ***listp, const char *fname,
int fatal, int include)
{
- int fd;
+ FILE *fp;
char line[MAXPATHLEN];
char *eob = line + MAXPATHLEN - 1;
extern int eol_nulls;
return;
if (*fname != '-' || fname[1])
- fd = open(fname, O_RDONLY|O_BINARY);
+ fp = fopen(fname, "rb");
else
- fd = 0;
- if (fd < 0) {
+ fp = stdin;
+ if (!fp) {
if (fatal) {
rsyserr(FERROR, errno,
"failed to open %s file %s",
}
while (1) {
- char ch, *s = line;
- int cnt;
+ char *s = line;
+ int ch;
while (1) {
- if ((cnt = read(fd, &ch, 1)) <= 0) {
- if (cnt < 0 && errno == EINTR)
+ if ((ch = getc(fp)) == EOF) {
+ if (ferror(fp) && errno == EINTR)
continue;
break;
}
* them but there's no need to save them. */
add_exclude(listp, line, include);
}
- if (cnt <= 0)
+ if (ch == EOF)
break;
}
- close(fd);
+ fclose(fp);
}
void send_exclude_list(int f)
{
int i;
- extern int protocol_version;
extern int list_only, recurse;
/* This is a complete hack - blame Rusty.
l = strlen(pattern);
if (l == 0) continue;
if (exclude_list[i]->include) {
- if (protocol_version < 19) {
- rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
- exit_cleanup(RERR_UNSUPPORTED);
- }
write_int(f,l+2);
write_buf(f,"+ ",2);
} else {
for (i=0; cvs_ignore_list[i]; i++)
add_exclude(&exclude_list, cvs_ignore_list[i], ADD_EXCLUDE);
- if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
- snprintf(fname,sizeof(fname), "%s/.cvsignore",p);
- add_exclude_file(&exclude_list,fname,MISSING_OK,ADD_EXCLUDE);
- }
+ if ((p = getenv("HOME"))
+ && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname)
+ add_exclude_file(&exclude_list, fname, MISSING_OK, ADD_EXCLUDE);
add_exclude_line(&exclude_list, getenv("CVSIGNORE"), ADD_EXCLUDE);
}