X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/cbdf862c63c8b1b764247668a83430da0bf49559..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/crtimes.diff

diff --git a/crtimes.diff b/crtimes.diff
index 1d50bc9..6c5148b 100644
--- a/crtimes.diff
+++ b/crtimes.diff
@@ -9,9 +9,10 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/compat.c b/compat.c
+index ef1882d..132ff90 100644
 --- a/compat.c
 +++ b/compat.c
-@@ -45,6 +45,7 @@ extern int force_change;
+@@ -44,6 +44,7 @@ extern int force_change;
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -19,7 +20,7 @@ diff --git a/compat.c b/compat.c
  extern int preserve_fileflags;
  extern int preserve_acls;
  extern int preserve_xattrs;
-@@ -62,7 +63,7 @@ extern iconv_t ic_send, ic_recv;
+@@ -62,7 +63,7 @@ extern char *iconv_opt;
  #endif
  
  /* These index values are for the file-list's extra-attribute array. */
@@ -27,8 +28,8 @@ diff --git a/compat.c b/compat.c
 +int uid_ndx, gid_ndx, crtimes_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
- 
-@@ -136,6 +137,8 @@ void setup_protocol(int f_out,int f_in)
+ int sender_symlink_iconv = 0;	/* sender should convert symlink content */
+@@ -138,6 +139,8 @@ void setup_protocol(int f_out,int f_in)
  		uid_ndx = ++file_extra_cnt;
  	if (preserve_gid)
  		gid_ndx = ++file_extra_cnt;
@@ -38,9 +39,10 @@ diff --git a/compat.c b/compat.c
  		fileflags_ndx = ++file_extra_cnt;
  	if (preserve_acls && !am_sender)
 diff --git a/flist.c b/flist.c
+index e1d01be..3287447 100644
 --- a/flist.c
 +++ b/flist.c
-@@ -56,6 +56,7 @@ extern int preserve_fileflags;
+@@ -56,6 +56,7 @@ extern int missing_args;
  extern int uid_ndx;
  extern int gid_ndx;
  extern int eol_nulls;
@@ -48,16 +50,16 @@ diff --git a/flist.c b/flist.c
  extern int relative_paths;
  extern int implied_dirs;
  extern int file_extra_cnt;
-@@ -385,7 +386,7 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
- 
- static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
+@@ -397,7 +398,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ #endif
+ 			    int ndx, int first_ndx)
  {
 -	static time_t modtime;
 +	static time_t modtime, crtime;
  	static mode_t mode;
  #ifdef SUPPORT_FILEFLAGS
  	static uint32 fileflags;
-@@ -470,6 +471,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -496,6 +497,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  		xflags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
@@ -71,7 +73,7 @@ diff --git a/flist.c b/flist.c
  
  #ifdef SUPPORT_HARD_LINKS
  	if (tmp_dev != 0) {
-@@ -539,6 +547,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -578,6 +586,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  		else
  			write_int(f, modtime);
  	}
@@ -80,7 +82,7 @@ diff --git a/flist.c b/flist.c
  	if (!(xflags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
  #ifdef SUPPORT_FILEFLAGS
-@@ -631,7 +641,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -670,7 +680,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  static struct file_struct *recv_file_entry(struct file_list *flist,
  					   int xflags, int f)
  {
@@ -89,7 +91,7 @@ diff --git a/flist.c b/flist.c
  	static mode_t mode;
  #ifdef SUPPORT_FILEFLAGS
  	static uint32 fileflags;
-@@ -766,6 +776,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -810,6 +820,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		} else
  			modtime = read_int(f);
  	}
@@ -109,7 +111,7 @@ diff --git a/flist.c b/flist.c
  	if (!(xflags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
  
-@@ -905,6 +928,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -969,6 +992,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		F_GROUP(file) = gid;
  		file->flags |= gid_flags;
  	}
@@ -118,7 +120,7 @@ diff --git a/flist.c b/flist.c
  	if (unsort_ndx)
  		F_NDX(file) = flist->used + flist->ndx_start;
  
-@@ -1257,6 +1282,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1358,6 +1383,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  		F_OWNER(file) = st.st_uid;
  	if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
  		F_GROUP(file) = st.st_gid;
@@ -128,17 +130,10 @@ diff --git a/flist.c b/flist.c
  	if (basename != thisname)
  		file->dirname = lastdir;
 diff --git a/generator.c b/generator.c
+index eee42e8..932f81c 100644
 --- a/generator.c
 +++ b/generator.c
-@@ -21,6 +21,7 @@
-  */
- 
- #include "rsync.h"
-+#include "ifuncs.h"
- 
- extern int verbose;
- extern int dry_run;
-@@ -40,6 +41,7 @@ extern int preserve_xattrs;
+@@ -40,6 +40,7 @@ extern int preserve_xattrs;
  extern int preserve_links;
  extern int preserve_devices;
  extern int preserve_specials;
@@ -146,7 +141,7 @@ diff --git a/generator.c b/generator.c
  extern int preserve_hard_links;
  extern int preserve_executability;
  extern int preserve_fileflags;
-@@ -620,6 +622,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+@@ -419,6 +420,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
  	if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
  		return 0;
  
@@ -160,7 +155,7 @@ diff --git a/generator.c b/generator.c
  #ifdef SUPPORT_ACLS
  	if (preserve_acls && !S_ISLNK(file->mode)) {
  		if (!ACL_READY(*sxp))
-@@ -663,6 +672,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -462,6 +470,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
  		 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
  		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
  			iflags |= ITEM_REPORT_TIME;
@@ -173,46 +168,57 @@ diff --git a/generator.c b/generator.c
  #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
  		if (S_ISLNK(file->mode)) {
  			;
-@@ -1210,6 +1225,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+@@ -1022,6 +1036,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
  static void list_file_entry(struct file_struct *f)
  {
  	char permbuf[PERMSTRING_SIZE];
 +	time_t crtime = crtimes_ndx ? f_crtime(f) : 0;
- 	double len;
+ 	int64 len;
+ 	int colwidth = human_readable ? 14 : 11;
  
- 	if (!F_IS_ACTIVE(f)) {
-@@ -1224,14 +1240,16 @@ static void list_file_entry(struct file_struct *f)
+@@ -1037,10 +1052,11 @@ static void list_file_entry(struct file_struct *f)
  
  #ifdef SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
--		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-+		rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
- 			permbuf, len, timestring(f->modtime),
+-		rprintf(FINFO, "%s %*s %s %s -> %s\n",
++		rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
+ 			permbuf, colwidth, comma_num(len),
+-			timestring(f->modtime), f_name(f, NULL),
+-			F_SYMLINK(f));
++			timestring(f->modtime),
 +			crtimes_ndx ? timestring(crtime) : "",
- 			f_name(f, NULL), F_SYMLINK(f));
++			f_name(f, NULL), F_SYMLINK(f));
  	} else
  #endif
- 	{
--		rprintf(FINFO, "%s %11.0f %s %s\n",
-+		rprintf(FINFO, "%s %11.0f %s %s %s\n",
- 			permbuf, len, timestring(f->modtime),
-+			crtimes_ndx ? timestring(crtime) : "",
+ 	if (missing_args == 2 && f->mode == 0) {
+@@ -1048,9 +1064,11 @@ static void list_file_entry(struct file_struct *f)
+ 			colwidth + 31, "*missing",
  			f_name(f, NULL));
+ 	} else {
+-		rprintf(FINFO, "%s %*s %s %s\n",
++		rprintf(FINFO, "%s %*s %s %s %s\n",
+ 			permbuf, colwidth, comma_num(len),
+-			timestring(f->modtime), f_name(f, NULL));
++			timestring(f->modtime),
++			crtimes_ndx ? timestring(crtime) : "",
++			f_name(f, NULL));
  	}
  }
-@@ -1323,6 +1341,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 
+@@ -1141,6 +1159,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
  			return;
  		}
  	}
 +	sx.crtime = 0;
  
- #ifdef SUPPORT_ACLS
- 	sx.acc_acl = sx.def_acl = NULL;
+ 	init_stat_x(&sx);
+ 	if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
 diff --git a/ifuncs.h b/ifuncs.h
+index 8c128d5..4254dfb 100644
 --- a/ifuncs.h
 +++ b/ifuncs.h
-@@ -67,6 +67,28 @@ d_name(struct dirent *di)
- #endif
+@@ -35,6 +35,28 @@ realloc_xbuf(xbuf *xb, size_t sz)
+ 	xb->size = sz;
  }
  
 +static inline time_t
@@ -238,12 +244,13 @@ diff --git a/ifuncs.h b/ifuncs.h
 +}
 +
  static inline int
- isDigit(const char *ptr)
+ to_wire_mode(mode_t mode)
  {
 diff --git a/log.c b/log.c
+index 83948b1..7a1d9ce 100644
 --- a/log.c
 +++ b/log.c
-@@ -653,7 +653,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -718,7 +718,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
  			c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
  			c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
  			c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
@@ -254,6 +261,7 @@ diff --git a/log.c b/log.c
  			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
  				char ch = iflags & ITEM_IS_NEW ? '+' : '?';
 diff --git a/options.c b/options.c
+index ae3d2d0..bb3bad3 100644
 --- a/options.c
 +++ b/options.c
 @@ -60,6 +60,7 @@ int preserve_specials = 0;
@@ -264,7 +272,7 @@ diff --git a/options.c b/options.c
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -362,6 +363,7 @@ void usage(enum logcode F)
+@@ -707,6 +708,7 @@ void usage(enum logcode F)
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
    rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
@@ -272,7 +280,7 @@ diff --git a/options.c b/options.c
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
  #ifdef SUPPORT_XATTRS
    rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
-@@ -508,6 +510,9 @@ static struct poptOption long_options[] = {
+@@ -863,6 +865,9 @@ static struct poptOption long_options[] = {
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 2, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
@@ -282,7 +290,7 @@ diff --git a/options.c b/options.c
    {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 1, 0, 0 },
    {"no-omit-dir-times",0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
    {"no-O",             0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
-@@ -1799,6 +1804,8 @@ void server_options(char **args, int *argc_p)
+@@ -2315,6 +2320,8 @@ void server_options(char **args, int *argc_p)
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -292,9 +300,10 @@ diff --git a/options.c b/options.c
  		argstr[x++] = 'p';
  	else if (preserve_executability && am_sender)
 diff --git a/rsync.c b/rsync.c
+index 3188535..ab4f8e4 100644
 --- a/rsync.c
 +++ b/rsync.c
-@@ -472,6 +472,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -471,6 +471,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  		else
  			file->flags |= FLAG_TIME_FAILED;
  	}
@@ -309,7 +318,7 @@ diff --git a/rsync.c b/rsync.c
  
  	change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
  	change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
-@@ -615,7 +623,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -619,7 +627,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
  	/* Change permissions before putting the file into place. */
  	set_file_attrs(fnametmp, file, NULL, fnamecmp,
  		       ATTRS_DELAY_IMMUTABLE
@@ -317,8 +326,8 @@ diff --git a/rsync.c b/rsync.c
 +		       | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME));
  
  	/* move tmp file over real file */
- 	if (verbose > 2)
-@@ -646,7 +654,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ 	if (DEBUG_GTE(RECV, 1))
+@@ -650,7 +658,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
  
    do_set_file_attrs:
  	set_file_attrs(fnametmp, file, NULL, fnamecmp,
@@ -328,17 +337,18 @@ diff --git a/rsync.c b/rsync.c
  	if (temp_copy_name) {
  		if (do_rename(fnametmp, fname) < 0) {
 diff --git a/rsync.h b/rsync.h
+index 16820fd..b3973c8 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -60,6 +60,7 @@
- #define XMIT_RDEV_MINOR_8_pre30 (1<<11)	/* protocols 28 - 29  */
+@@ -61,6 +61,7 @@
  #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
  #define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - now (HLINKED files only) */
+ #define XMIT_IO_ERROR_ENDLIST (1<<12)	/* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */
 +#define XMIT_CRTIME_EQ_MTIME (1<<13)	/* protocols ?? - now */
  #define XMIT_SAME_FLAGS (1<<14)		/* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
-@@ -154,6 +155,7 @@
+@@ -157,6 +158,7 @@
  #define ATTRS_REPORT		(1<<0)
  #define ATTRS_SKIP_MTIME	(1<<1)
  #define ATTRS_DELAY_IMMUTABLE	(1<<2)
@@ -346,7 +356,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -170,7 +172,7 @@
+@@ -173,7 +175,7 @@
  #define FNAMECMP_FUZZY		0x83
  
  /* For use by the itemize_changes code */
@@ -355,7 +365,7 @@ diff --git a/rsync.h b/rsync.h
  #define ITEM_REPORT_CHANGE (1<<1)
  #define ITEM_REPORT_SIZE (1<<2)     /* regular files only */
  #define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
-@@ -651,6 +653,7 @@ extern int file_extra_cnt;
+@@ -677,6 +679,7 @@ extern int file_extra_cnt;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
@@ -363,7 +373,7 @@ diff --git a/rsync.h b/rsync.h
  extern int fileflags_ndx;
  extern int acls_ndx;
  extern int xattrs_ndx;
-@@ -658,6 +661,7 @@ extern int xattrs_ndx;
+@@ -684,6 +687,7 @@ extern int xattrs_ndx;
  #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
  #define EXTRA_LEN (sizeof (union file_extras))
  #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
@@ -371,7 +381,7 @@ diff --git a/rsync.h b/rsync.h
  #define DEV_EXTRA_CNT 2
  #define DIRNODE_EXTRA_CNT 3
  #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
-@@ -916,6 +920,7 @@ typedef struct {
+@@ -954,6 +958,7 @@ typedef struct {
  
  typedef struct {
      STRUCT_STAT st;
@@ -380,9 +390,10 @@ diff --git a/rsync.h b/rsync.h
      struct rsync_acl *acc_acl; /* access ACL */
      struct rsync_acl *def_acl; /* default ACL */
 diff --git a/rsync.yo b/rsync.yo
+index 7b41d5f..5670c46 100644
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -350,6 +350,7 @@ to the detailed description below for a complete description.  verb(
+@@ -357,6 +357,7 @@ to the detailed description below for a complete description.  verb(
   -D                          same as --devices --specials
   -t, --times                 preserve modification times
   -O, --omit-dir-times        omit directories from --times
@@ -390,7 +401,7 @@ diff --git a/rsync.yo b/rsync.yo
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-@@ -1022,6 +1023,9 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
+@@ -1099,6 +1100,9 @@ it is preserving modification times (see bf(--times)).  If NFS is sharing
  the directories on the receiving side, it is a good idea to use bf(-O).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -400,7 +411,7 @@ diff --git a/rsync.yo b/rsync.yo
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1674,7 +1678,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -1861,7 +1865,7 @@ with older versions of rsync, but that also turns on the output of other
  verbose messages).
  
  The "%i" escape has a cryptic output that is 11 letters long.  The general
@@ -409,7 +420,7 @@ diff --git a/rsync.yo b/rsync.yo
  type of update being done, bf(X) is replaced by the file-type, and the
  other letters represent attributes that may be output if they are being
  modified.
-@@ -1733,6 +1737,8 @@ quote(itemization(
+@@ -1920,6 +1924,8 @@ quote(itemization(
    it() The bf(f) means that the fileflags information changed.
    it() The bf(a) means that the ACL information changed.
    it() The bf(x) means that the extended attribute information changed.
@@ -419,6 +430,7 @@ diff --git a/rsync.yo b/rsync.yo
  
  One other output is possible:  when deleting files, the "%i" will output
 diff --git a/syscall.c b/syscall.c
+index 45604b1..c463997 100644
 --- a/syscall.c
 +++ b/syscall.c
 @@ -37,6 +37,11 @@ extern int force_change;
@@ -469,6 +481,7 @@ diff --git a/syscall.c b/syscall.c
 +}
 diff --git a/testsuite/crtimes.test b/testsuite/crtimes.test
 new file mode 100644
+index 0000000..b904e16
 --- /dev/null
 +++ b/testsuite/crtimes.test
 @@ -0,0 +1,24 @@
@@ -497,6 +510,7 @@ new file mode 100644
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
+index b26aee3..4faaf93 100644
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns
 @@ -24,9 +24,9 @@ todir="$tmpdir/to"
@@ -513,9 +527,10 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
  # Berkley's nice.
  PATH="$PATH:/usr/ucb"
 diff --git a/tls.c b/tls.c
+index 8cc5748..6da4df9 100644
 --- a/tls.c
 +++ b/tls.c
-@@ -105,6 +105,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
+@@ -108,6 +108,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
  
  #endif
  
@@ -524,7 +539,7 @@ diff --git a/tls.c b/tls.c
  static void failed(char const *what, char const *where)
  {
  	fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -112,16 +114,36 @@ static void failed(char const *what, char const *where)
+@@ -115,16 +117,36 @@ static void failed(char const *what, char const *where)
  	exit(1);
  }
  
@@ -563,7 +578,7 @@ diff --git a/tls.c b/tls.c
  #ifdef SUPPORT_XATTRS
  	if (am_root < 0)
  		stat_xattr(fname, &buf);
-@@ -154,19 +176,11 @@ static void list_file(const char *fname)
+@@ -159,19 +181,11 @@ static void list_file(const char *fname)
  
  	permstring(permbuf, buf.st_mode);
  
@@ -588,10 +603,10 @@ diff --git a/tls.c b/tls.c
  
  	/* TODO: Perhaps escape special characters in fname? */
  
-@@ -177,13 +191,14 @@ static void list_file(const char *fname)
+@@ -182,13 +196,14 @@ static void list_file(const char *fname)
  		    (long)minor(buf.st_rdev));
- 	} else /* NB: use double for size since it might not fit in a long. */
- 		printf("%12.0f", (double)buf.st_size);
+ 	} else
+ 		printf("%15s", do_big_num(buf.st_size, 1, NULL));
 -	printf(" %6ld.%-6ld %6ld %s %s%s\n",
 +	printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
  	       (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
@@ -602,14 +617,14 @@ diff --git a/tls.c b/tls.c
  static struct poptOption long_options[] = {
    /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
 +  {"crtimes",         'N', POPT_ARG_NONE,   &display_crtimes, 0, 0, 0},
+   {"link-times",      'l', POPT_ARG_NONE,   &link_times, 0, 0, 0 },
+   {"link-owner",      'L', POPT_ARG_NONE,   &link_owner, 0, 0, 0 },
  #ifdef SUPPORT_XATTRS
-   {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
- #endif
-@@ -197,6 +212,7 @@ static void tls_usage(int ret)
+@@ -204,6 +219,7 @@ static void tls_usage(int ret)
    fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
    fprintf(F,"Trivial file listing program for portably checking rsync\n");
    fprintf(F,"\nOptions:\n");
 +  fprintf(F," -N, --crtimes               display create times (newness)\n");
+   fprintf(F," -l, --link-times            display the time on a symlink\n");
+   fprintf(F," -L, --link-owner            display the owner+group on a symlink\n");
  #ifdef SUPPORT_XATTRS
-   fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
- #endif