From c0be1af2e8abb57c98ab2144365f3ba1ebbe7ebb Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 23 Mar 2005 17:53:40 +0000
Subject: [PATCH] Changed tls.c to not display the atime for a directory.

---
 atimes.diff | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/atimes.diff b/atimes.diff
index 2fdfda2..8abbad9 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,7 +4,7 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2005-03-16 02:19:29.133830510
+--- orig/batch.c	2005-03-16 02:19:29
 +++ batch.c	2004-07-03 20:15:41
 @@ -197,6 +197,8 @@ void show_flist(int index, struct file_s
  		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
@@ -15,7 +15,7 @@ command before "make":
  		rprintf(FINFO, "flist->length=%.0f\n",
  			(double) fptr[i]->length);
  		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c	2005-03-16 02:19:29.897764030
+--- orig/flist.c	2005-03-16 02:19:29
 +++ flist.c	2005-02-07 21:06:04
 @@ -54,6 +54,7 @@ extern int relative_paths;
  extern int implied_dirs;
@@ -127,7 +127,7 @@ command before "make":
  	file->length = st.st_size;
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
---- orig/generator.c	2005-03-16 02:19:29.980756807
+--- orig/generator.c	2005-03-17 09:05:21
 +++ generator.c	2004-11-03 23:02:12
 @@ -373,7 +373,7 @@ static int unchanged_file(char *fn, stru
  	if (ignore_times)
@@ -147,7 +147,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2005-03-16 02:19:30.152741841
+--- orig/options.c	2005-03-17 09:05:21
 +++ options.c	2005-02-21 10:53:28
 @@ -50,6 +50,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
@@ -182,7 +182,7 @@ command before "make":
  	if (omit_dir_times == 2 && am_sender)
  		argstr[x++] = 'O';
  	if (preserve_perms)
---- orig/rsync.c	2005-03-16 02:19:30.453715649
+--- orig/rsync.c	2005-03-16 02:19:30
 +++ rsync.c	2005-02-21 10:57:03
 @@ -27,6 +27,7 @@ extern int dry_run;
  extern int daemon_log_format_has_i;
@@ -234,7 +234,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2005-03-16 02:19:30.524709471
+--- orig/rsync.h	2005-03-16 02:19:30
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -260,7 +260,7 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2005-03-16 02:19:30.727691806
+--- orig/rsync.yo	2005-03-16 02:19:30
 +++ rsync.yo	2005-01-24 01:57:18
 @@ -321,6 +321,7 @@ to the detailed description below for a 
   -D, --devices               preserve devices (root only)
@@ -333,7 +333,7 @@ command before "make":
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  
 --- orig/tls.c	2005-01-19 19:30:29
-+++ tls.c	2004-07-03 20:15:41
++++ tls.c	2005-03-23 17:49:48
 @@ -39,6 +39,7 @@
  
  
@@ -412,7 +412,7 @@ command before "make":
 +	printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
  	       (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
 -	       datebuf, fname, linkbuf);
-+ 	       mtimebuf, display_atime ? atimebuf : "",
++ 	       mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
 +	       fname, linkbuf);
  }
  
@@ -469,7 +469,7 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2005-03-11 17:36:35
+--- orig/util.c	2005-03-17 09:05:21
 +++ util.c	2005-02-07 21:09:12
 @@ -128,12 +128,17 @@ void overflow(char *str)
  
-- 
2.34.1