X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1f52f4c407ad9e9f2e73514f351ff24f61d0324a..6a46226b3a4ee1c7ab1a4929c8dddeb70c6c5473:/exclude.c

diff --git a/exclude.c b/exclude.c
index 3b70b4e5..53852f69 100644
--- 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
@@ -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 *make_exclude(char *pattern, int include)
+static struct exclude_struct *make_exclude(const char *pattern, int include)
 {
 	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++) {
-                        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 +179,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)
@@ -206,12 +207,12 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include)
 	(*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)
 {
@@ -220,7 +221,10 @@ struct exclude_struct **make_exclude_list(char *fname,
 	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;
@@ -242,7 +246,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;
 
@@ -394,7 +398,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);
 	}