-/*
- 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
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(const char *pattern, int include)
{
struct exclude_struct *ret;
/* If a trailing slash is present to match only directories,
* then it is stripped out by make_exclude. So as a special
* case we add it back in here. */
+
+ /* FIXME: At the moment if you don't specify --recursive, this
+ * seems to give messages like "excluding file
+ * mbpconfig/.Xresources because of pattern /*""/*", which is
+ * a bit confusing. See Rusty's gross hack below. */
if (verbose >= 2)
rprintf(FINFO, "%s %s %s because of pattern %s%s\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;
}
-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)
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)
{
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;
}
-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;
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);
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);
}