- Made glob_expand_one() public.

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 1ae3368..5d09fd3 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -6,8 +6,9 @@
  * Copyright (C) 2003-2007 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 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
@@ -32,7 +33,6 @@ extern int preserve_xattrs;
 extern int preserve_perms;
 extern int preserve_executability;
 extern int preserve_times;
-extern int omit_dir_times;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
@@ -310,7 +310,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                set_stat_xattr(fname, file);
 #endif
 
-       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
+       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
                flags |= ATTRS_SKIP_MTIME;
        if (!(flags & ATTRS_SKIP_MTIME)
            && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {