Try to fix ctype issues by always calling these functions as

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index a9d32a3..dc469e1 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -1,22 +1,23 @@
 /* -*- 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
-   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.
-*/
+ * 
+ * Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
+ * 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 :) */
@@ -30,7 +31,7 @@ extern int delete_mode;
 
 static struct exclude_struct **exclude_list;
 
-/* build an exclude structure given a exclude pattern */
+/** Build an exclude structure given a exclude pattern */
 static struct exclude_struct *make_exclude(const char *pattern, int include)
 {
        struct exclude_struct *ret;
@@ -201,9 +202,11 @@ void add_exclude_list(const char *pattern, struct exclude_struct ***list, int in
        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;
 }
 
@@ -260,7 +263,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);
        }
@@ -329,7 +335,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? */
@@ -342,7 +348,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;