Use "#if" (not "#ifdef") for configure-defined macros.

[rsync/rsync.git] / util.c

diff --git a/util.c b/util.c
index 99a3a5d..6887d67 100644 (file)
--- a/util.c
+++ b/util.c
@@ -32,7 +32,7 @@ extern int dry_run;
 extern int module_id;
 extern int modify_window;
 extern char *partial_dir;
-extern struct exclude_list_struct server_exclude_list;
+extern struct filter_list_struct server_filter_list;
 
 int sanitize_paths = 0;
 
@@ -130,22 +130,22 @@ void overflow(char *str)
 
 int set_modtime(char *fname, time_t modtime)
 {
-       if (dry_run)
-               return 0;
-
        if (verbose > 2) {
                rprintf(FINFO, "set modtime of %s to (%ld) %s",
                        fname, (long)modtime,
                        asctime(localtime(&modtime)));
        }
 
+       if (dry_run)
+               return 0;
+
        {
-#ifdef HAVE_UTIMBUF
+#if HAVE_UTIMBUF
                struct utimbuf tbuf;
                tbuf.actime = time(NULL);
                tbuf.modtime = modtime;
                return utime(fname,&tbuf);
-#elif defined(HAVE_UTIME)
+#elif HAVE_UTIME
                time_t t[2];
                t[0] = time(NULL);
                t[1] = modtime;
@@ -479,14 +479,14 @@ int lock_range(int fd, int offset, int len)
        return fcntl(fd,F_SETLK,&lock) == 0;
 }
 
-static int exclude_server_path(char *arg)
+static int filter_server_path(char *arg)
 {
        char *s;
 
-       if (server_exclude_list.head) {
+       if (server_filter_list.head) {
                for (s = arg; (s = strchr(s, '/')) != NULL; ) {
                        *s = '\0';
-                       if (check_exclude(&server_exclude_list, arg, 1) < 0) {
+                       if (check_filter(&server_filter_list, arg, 1) < 0) {
                                /* We must leave arg truncated! */
                                return 1;
                        }
@@ -502,7 +502,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        char **argv = *argv_ptr;
        int argc = *argc_ptr;
        int maxargs = *maxargs_ptr;
-#if !(defined(HAVE_GLOB) && defined(HAVE_GLOB_H))
+#if !(HAVE_GLOB && HAVE_GLOB_H)
        if (argc == maxargs) {
                maxargs += MAX_ARGS;
                if (!(argv = realloc_array(argv, char *, maxargs)))
@@ -513,7 +513,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
        if (!*s)
                s = ".";
        s = argv[argc++] = strdup(s);
-       exclude_server_path(s);
+       filter_server_path(s);
 #else
        glob_t globbuf;
        int i;
@@ -529,7 +529,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr,
                s = strdup(s);
 
        memset(&globbuf, 0, sizeof globbuf);
-       if (!exclude_server_path(s))
+       if (!filter_server_path(s))
                glob(s, 0, NULL, &globbuf);
        if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) {
                maxargs += globbuf.gl_pathc + MAX_ARGS;
@@ -966,8 +966,8 @@ char *partial_dir_fname(const char *fname)
                fn = fname;
        if ((int)pathjoin(t, sz, partial_dir, fn) >= sz)
                return NULL;
-       if (server_exclude_list.head
-           && check_exclude(&server_exclude_list, partial_fname, 0) < 0)
+       if (server_filter_list.head
+           && check_filter(&server_filter_list, partial_fname, 0) < 0)
                return NULL;
 
        return partial_fname;
@@ -1094,7 +1094,7 @@ char *timestring(time_t t)
        static char TimeBuf[200];
        struct tm *tm = localtime(&t);
 
-#ifdef HAVE_STRFTIME
+#if HAVE_STRFTIME
        strftime(TimeBuf, sizeof TimeBuf - 1, "%Y/%m/%d %H:%M:%S", tm);
 #else
        strlcpy(TimeBuf, asctime(tm), sizeof TimeBuf);