1 This patch adds a --crtimes (-N) option that will preserve
4 To use this patch, run these commands for a successful build:
6 patch -p1 <patches/fileflags.diff
7 patch -p1 <patches/crtimes.diff
8 ./configure (optional if already run)
11 based-on: patch/fileflags
12 diff --git a/compat.c b/compat.c
15 @@ -44,6 +44,7 @@ extern int force_change;
16 extern int protect_args;
17 extern int preserve_uid;
18 extern int preserve_gid;
19 +extern int preserve_crtimes;
20 extern int preserve_fileflags;
21 extern int preserve_acls;
22 extern int preserve_xattrs;
23 @@ -62,7 +63,7 @@ extern char *iconv_opt;
26 /* These index values are for the file-list's extra-attribute array. */
27 -int uid_ndx, gid_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
28 +int uid_ndx, gid_ndx, crtimes_ndx, fileflags_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
30 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
31 int sender_symlink_iconv = 0; /* sender should convert symlink content */
32 @@ -138,6 +139,8 @@ void setup_protocol(int f_out,int f_in)
33 uid_ndx = ++file_extra_cnt;
35 gid_ndx = ++file_extra_cnt;
36 + if (preserve_crtimes)
37 + crtimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT);
38 if (preserve_fileflags || (force_change && !am_sender))
39 fileflags_ndx = ++file_extra_cnt;
40 if (preserve_acls && !am_sender)
41 diff --git a/flist.c b/flist.c
44 @@ -56,6 +56,7 @@ extern int missing_args;
48 +extern int crtimes_ndx;
49 extern int relative_paths;
50 extern int implied_dirs;
51 extern int file_extra_cnt;
52 @@ -397,7 +398,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
54 int ndx, int first_ndx)
56 - static time_t modtime;
57 + static time_t modtime, crtime;
59 #ifdef SUPPORT_FILEFLAGS
60 static uint32 fileflags;
61 @@ -506,6 +507,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
62 xflags |= XMIT_SAME_TIME;
64 modtime = file->modtime;
66 + time_t file_crtime = f_crtime(file);
67 + if (file_crtime == modtime)
68 + xflags |= XMIT_CRTIME_EQ_MTIME;
70 + crtime = file_crtime;
73 #ifdef SUPPORT_HARD_LINKS
75 @@ -588,6 +596,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
77 write_int(f, modtime);
79 + if (crtimes_ndx && !(xflags & XMIT_CRTIME_EQ_MTIME))
80 + write_varlong(f, crtime, 4);
81 if (!(xflags & XMIT_SAME_MODE))
82 write_int(f, to_wire_mode(mode));
83 #ifdef SUPPORT_FILEFLAGS
84 @@ -680,7 +690,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
85 static struct file_struct *recv_file_entry(struct file_list *flist,
88 - static int64 modtime;
89 + static int64 modtime, crtime;
91 #ifdef SUPPORT_FILEFLAGS
92 static uint32 fileflags;
93 @@ -819,6 +829,19 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
95 modtime = read_int(f);
98 + if (!(xflags & XMIT_CRTIME_EQ_MTIME)) {
99 + crtime = read_varlong(f, 4);
100 +#if SIZEOF_TIME_T < SIZEOF_INT64
101 + if (!am_generator && (int64)(time_t)crtime != crtime) {
102 + rprintf(FERROR_XFER,
103 + "Create time value of %s truncated on receiver.\n",
110 if (!(xflags & XMIT_SAME_MODE))
111 mode = from_wire_mode(read_int(f));
113 @@ -979,6 +1002,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
115 file->flags |= gid_flags;
118 + f_crtime_set(file, (time_t)crtime);
120 F_NDX(file) = flist->used + flist->ndx_start;
122 @@ -1368,6 +1393,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
123 F_OWNER(file) = st.st_uid;
124 if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */
125 F_GROUP(file) = st.st_gid;
127 + f_crtime_set(file, get_create_time(fname));
129 if (basename != thisname)
130 file->dirname = lastdir;
131 diff --git a/generator.c b/generator.c
134 @@ -40,6 +40,7 @@ extern int preserve_xattrs;
135 extern int preserve_links;
136 extern int preserve_devices;
137 extern int preserve_specials;
138 +extern int preserve_fileflags;
139 extern int preserve_hard_links;
140 extern int preserve_executability;
141 extern int preserve_fileflags;
142 @@ -419,6 +420,13 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
143 if (gid_ndx && !(file->flags & FLAG_SKIP_GROUP) && sxp->st.st_gid != (gid_t)F_GROUP(file))
147 + if (sxp->crtime == 0)
148 + sxp->crtime = get_create_time(fname);
149 + if (cmp_time(sxp->crtime, f_crtime(file)) != 0)
154 if (preserve_acls && !S_ISLNK(file->mode)) {
155 if (!ACL_READY(*sxp))
156 @@ -462,6 +470,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
157 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
158 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
159 iflags |= ITEM_REPORT_TIME;
161 + if (sxp->crtime == 0)
162 + sxp->crtime = get_create_time(fnamecmp);
163 + if (cmp_time(sxp->crtime, f_crtime(file)) != 0)
164 + iflags |= ITEM_REPORT_CRTIME;
166 #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
167 if (S_ISLNK(file->mode)) {
169 @@ -1022,6 +1036,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
170 static void list_file_entry(struct file_struct *f)
172 char permbuf[PERMSTRING_SIZE];
173 + time_t crtime = crtimes_ndx ? f_crtime(f) : 0;
175 int colwidth = human_readable ? 14 : 11;
177 @@ -1037,10 +1052,11 @@ static void list_file_entry(struct file_struct *f)
180 if (preserve_links && S_ISLNK(f->mode)) {
181 - rprintf(FINFO, "%s %*s %s %s -> %s\n",
182 + rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
183 permbuf, colwidth, comma_num(len),
184 - timestring(f->modtime), f_name(f, NULL),
186 + timestring(f->modtime),
187 + crtimes_ndx ? timestring(crtime) : "",
188 + f_name(f, NULL), F_SYMLINK(f));
191 if (missing_args == 2 && f->mode == 0) {
192 @@ -1048,9 +1064,11 @@ static void list_file_entry(struct file_struct *f)
193 colwidth + 31, "*missing",
196 - rprintf(FINFO, "%s %*s %s %s\n",
197 + rprintf(FINFO, "%s %*s %s %s %s\n",
198 permbuf, colwidth, comma_num(len),
199 - timestring(f->modtime), f_name(f, NULL));
200 + timestring(f->modtime),
201 + crtimes_ndx ? timestring(crtime) : "",
206 @@ -1141,6 +1159,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
213 if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
214 diff --git a/ifuncs.h b/ifuncs.h
217 @@ -35,6 +35,28 @@ realloc_xbuf(xbuf *xb, size_t sz)
221 +static inline time_t
222 +f_crtime(struct file_struct *fp)
224 +#if SIZEOF_TIME_T > 4
226 + memcpy(&crtime, &REQ_EXTRA(fp, crtimes_ndx)->unum, SIZEOF_TIME_T);
229 + return REQ_EXTRA(fp, crtimes_ndx)->unum;
234 +f_crtime_set(struct file_struct *fp, time_t crtime)
236 +#if SIZEOF_TIME_T > 4
237 + memcpy(&REQ_EXTRA(fp, crtimes_ndx)->unum, &crtime, SIZEOF_TIME_T);
239 + REQ_EXTRA(fp, crtimes_ndx)->unum = (uint32)crtime;
244 to_wire_mode(mode_t mode)
246 diff --git a/log.c b/log.c
249 @@ -718,7 +718,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
250 c[8] = !(iflags & ITEM_REPORT_FFLAGS) ? '.' : 'f';
251 c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
252 c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
254 + c[11] = !(iflags & ITEM_REPORT_CRTIME) ? '.' : 'n';
257 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
258 char ch = iflags & ITEM_IS_NEW ? '+' : '?';
259 diff --git a/options.c b/options.c
262 @@ -60,6 +60,7 @@ int preserve_specials = 0;
263 int preserve_uid = 0;
264 int preserve_gid = 0;
265 int preserve_times = 0;
266 +int preserve_crtimes = 0;
270 @@ -707,6 +708,7 @@ void usage(enum logcode F)
271 rprintf(F," -D same as --devices --specials\n");
272 rprintf(F," -t, --times preserve modification times\n");
273 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
274 + rprintf(F," -N, --crtimes preserve create times (newness)\n");
275 rprintf(F," --super receiver attempts super-user activities\n");
276 #ifdef SUPPORT_XATTRS
277 rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
278 @@ -863,6 +865,9 @@ static struct poptOption long_options[] = {
279 {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 },
280 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
281 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
282 + {"crtimes", 'N', POPT_ARG_VAL, &preserve_crtimes, 1, 0, 0 },
283 + {"no-crtimes", 0, POPT_ARG_VAL, &preserve_crtimes, 0, 0, 0 },
284 + {"no-N", 0, POPT_ARG_VAL, &preserve_crtimes, 0, 0, 0 },
285 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
286 {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
287 {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
288 @@ -2332,6 +2337,8 @@ void server_options(char **args, int *argc_p)
292 + if (preserve_crtimes)
296 else if (preserve_executability && am_sender)
297 diff --git a/rsync.c b/rsync.c
300 @@ -471,6 +471,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
302 file->flags |= FLAG_TIME_FAILED;
304 + if (crtimes_ndx && !(flags & ATTRS_SKIP_CRTIME)) {
305 + time_t file_crtime = f_crtime(file);
306 + if (sxp->crtime == 0)
307 + sxp->crtime = get_create_time(fname);
308 + if (cmp_time(sxp->crtime, file_crtime) != 0
309 + && set_create_time(fname, file_crtime) == 0)
313 change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
314 change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
315 @@ -619,7 +627,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
316 /* Change permissions before putting the file into place. */
317 set_file_attrs(fnametmp, file, NULL, fnamecmp,
318 ATTRS_DELAY_IMMUTABLE
319 - | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME));
320 + | (ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME));
322 /* move tmp file over real file */
323 if (DEBUG_GTE(RECV, 1))
324 @@ -650,7 +658,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
327 set_file_attrs(fnametmp, file, NULL, fnamecmp,
328 - ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
329 + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_CRTIME);
331 if (temp_copy_name) {
332 if (do_rename(fnametmp, fname) < 0) {
333 diff --git a/rsync.h b/rsync.h
337 #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
338 #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
339 #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */
340 +#define XMIT_CRTIME_EQ_MTIME (1<<13) /* protocols ?? - now */
341 #define XMIT_SAME_FLAGS (1<<14) /* protocols ?? - now */
343 /* These flags are used in the live flist data. */
345 #define ATTRS_REPORT (1<<0)
346 #define ATTRS_SKIP_MTIME (1<<1)
347 #define ATTRS_DELAY_IMMUTABLE (1<<2)
348 +#define ATTRS_SKIP_CRTIME (1<<3)
351 #define NORMAL_FLUSH 0
353 #define FNAMECMP_FUZZY 0x83
355 /* For use by the itemize_changes code */
356 -#define ITEM_REPORT_ATIME (1<<0)
357 +#define ITEM_REPORT_CRTIME (1<<0)
358 #define ITEM_REPORT_CHANGE (1<<1)
359 #define ITEM_REPORT_SIZE (1<<2) /* regular files only */
360 #define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
361 @@ -681,6 +683,7 @@ extern int file_extra_cnt;
362 extern int inc_recurse;
365 +extern int crtimes_ndx;
366 extern int fileflags_ndx;
368 extern int xattrs_ndx;
369 @@ -688,6 +691,7 @@ extern int xattrs_ndx;
370 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
371 #define EXTRA_LEN (sizeof (union file_extras))
372 #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
373 +#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN)
374 #define DEV_EXTRA_CNT 2
375 #define DIRNODE_EXTRA_CNT 3
376 #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
377 @@ -955,6 +959,7 @@ typedef struct {
383 struct rsync_acl *acc_acl; /* access ACL */
384 struct rsync_acl *def_acl; /* default ACL */
385 diff --git a/rsync.yo b/rsync.yo
388 @@ -357,6 +357,7 @@ to the detailed description below for a complete description. verb(
389 -D same as --devices --specials
390 -t, --times preserve modification times
391 -O, --omit-dir-times omit directories from --times
392 + -N, --crtimes preserve create times (newness)
393 --super receiver attempts super-user activities
394 --fake-super store/recover privileged attrs using xattrs
395 -S, --sparse handle sparse files efficiently
396 @@ -1106,6 +1107,9 @@ it is preserving modification times (see bf(--times)). If NFS is sharing
397 the directories on the receiving side, it is a good idea to use bf(-O).
398 This option is inferred if you use bf(--backup) without bf(--backup-dir).
400 +dit(bf(-N, --crtimes)) This tells rsync to set the create times (newness) of
401 +the destination files to the same value as the source files.
403 dit(bf(--super)) This tells the receiving side to attempt super-user
404 activities even if the receiving rsync wasn't run by the super-user. These
405 activities include: preserving users via the bf(--owner) option, preserving
406 @@ -1880,7 +1884,7 @@ with older versions of rsync, but that also turns on the output of other
409 The "%i" escape has a cryptic output that is 11 letters long. The general
410 -format is like the string bf(YXcstpogfax), where bf(Y) is replaced by the
411 +format is like the string bf(YXcstpogfaxn), where bf(Y) is replaced by the
412 type of update being done, bf(X) is replaced by the file-type, and the
413 other letters represent attributes that may be output if they are being
415 @@ -1939,6 +1943,8 @@ quote(itemization(
416 it() The bf(f) means that the fileflags information changed.
417 it() The bf(a) means that the ACL information changed.
418 it() The bf(x) means that the extended attribute information changed.
419 + it() A bf(n) means the create time (newness) is different and is being
420 + updated to the sender's value (requires bf(--crtimes)).
423 One other output is possible: when deleting files, the "%i" will output
424 diff --git a/syscall.c b/syscall.c
427 @@ -37,6 +37,11 @@ extern int force_change;
428 extern int preserve_perms;
429 extern int preserve_executability;
431 +struct create_time {
432 + unsigned long length;
433 + struct timespec crtime;
436 #define RETURN_ERROR_IF(x,e) \
439 @@ -394,3 +399,33 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
440 return lseek(fd, offset, whence);
444 +time_t get_create_time(const char *path)
446 + static struct create_time attrBuf;
447 + struct attrlist attrList;
449 + memset(&attrList, 0, sizeof attrList);
450 + attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
451 + attrList.commonattr = ATTR_CMN_CRTIME;
452 + if (getattrlist(path, &attrList, &attrBuf, sizeof attrBuf, FSOPT_NOFOLLOW) < 0)
454 + return attrBuf.crtime.tv_sec;
457 +int set_create_time(const char *path, time_t crtime)
459 + struct attrlist attrList;
460 + struct timespec ts;
462 + if (dry_run) return 0;
463 + RETURN_ERROR_IF_RO_OR_LO;
465 + ts.tv_sec = crtime;
468 + memset(&attrList, 0, sizeof attrList);
469 + attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
470 + attrList.commonattr = ATTR_CMN_CRTIME;
471 + return setattrlist(path, &attrList, &ts, sizeof ts, FSOPT_NOFOLLOW);
473 diff --git a/testsuite/crtimes.test b/testsuite/crtimes.test
476 +++ b/testsuite/crtimes.test
480 +# Test rsync copying create times
482 +. "$suitedir/rsync.fns"
484 +# Setting an older time via touch sets the create time to the mtime.
485 +# Setting it to a newer time affects just the mtime.
488 +echo hiho "$fromdir/foo"
490 +touch -t 200101011111.11 "$fromdir"
491 +touch -t 200202022222.22 "$fromdir"
493 +touch -t 200111111111.11 "$fromdir/foo"
494 +touch -t 200212122222.22 "$fromdir/foo"
498 +checkit "$RSYNC -rtgvvv --crtimes \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
500 +# The script would have aborted on error, so getting here means we've won.
502 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
503 --- a/testsuite/rsync.fns
504 +++ b/testsuite/rsync.fns
505 @@ -24,9 +24,9 @@ todir="$tmpdir/to"
508 # For itemized output:
509 -all_plus='+++++++++'
511 -dots='.....' # trailing dots after changes
512 +all_plus='++++++++++'
514 +dots='......' # trailing dots after changes
517 PATH="$PATH:/usr/ucb"
518 diff --git a/tls.c b/tls.c
521 @@ -108,6 +108,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
525 +static int display_crtimes = 0;
527 static void failed(char const *what, char const *where)
529 fprintf(stderr, PROGRAM ": %s %s: %s\n",
530 @@ -115,16 +117,36 @@ static void failed(char const *what, char const *where)
534 +static void storetime(char *dest, time_t t, size_t destsize)
537 + struct tm *mt = gmtime(&t);
539 + snprintf(dest, destsize,
540 + "%04d-%02d-%02d %02d:%02d:%02d ",
541 + (int)mt->tm_year + 1900,
542 + (int)mt->tm_mon + 1,
548 + strlcpy(dest, " ", destsize);
551 static void list_file(const char *fname)
555 char permbuf[PERMSTRING_SIZE];
559 + char crtimebuf[50];
562 if (do_lstat(fname, &buf) < 0)
563 failed("stat", fname);
564 + if (display_crtimes && (crtime = get_create_time(fname)) == 0)
565 + failed("get_create_time", fname);
566 #ifdef SUPPORT_XATTRS
568 stat_xattr(fname, &buf);
569 @@ -159,19 +181,11 @@ static void list_file(const char *fname)
571 permstring(permbuf, buf.st_mode);
573 - if (buf.st_mtime) {
574 - mt = gmtime(&buf.st_mtime);
576 - snprintf(datebuf, sizeof datebuf,
577 - "%04d-%02d-%02d %02d:%02d:%02d",
578 - (int)mt->tm_year + 1900,
579 - (int)mt->tm_mon + 1,
585 - strlcpy(datebuf, " ", sizeof datebuf);
586 + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
587 + if (display_crtimes)
588 + storetime(crtimebuf, crtime, sizeof crtimebuf);
590 + crtimebuf[0] = '\0';
592 /* TODO: Perhaps escape special characters in fname? */
594 @@ -182,13 +196,14 @@ static void list_file(const char *fname)
595 (long)minor(buf.st_rdev));
597 printf("%15s", do_big_num(buf.st_size, 1, NULL));
598 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
599 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
600 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
601 - datebuf, fname, linkbuf);
602 + mtimebuf, crtimebuf, fname, linkbuf);
605 static struct poptOption long_options[] = {
606 /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
607 + {"crtimes", 'N', POPT_ARG_NONE, &display_crtimes, 0, 0, 0},
608 {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 },
609 {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 },
610 #ifdef SUPPORT_XATTRS
611 @@ -204,6 +219,7 @@ static void tls_usage(int ret)
612 fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
613 fprintf(F,"Trivial file listing program for portably checking rsync\n");
614 fprintf(F,"\nOptions:\n");
615 + fprintf(F," -N, --crtimes display create times (newness)\n");
616 fprintf(F," -l, --link-times display the time on a symlink\n");
617 fprintf(F," -L, --link-owner display the owner+group on a symlink\n");
618 #ifdef SUPPORT_XATTRS