patch -p1 <patches/fileflags.diff
patch -p1 <patches/crtimes.diff
- ./configure (optional if already run)
+ ./prepare-source
+ ./configure
make
based-on: patch/master/fileflags
diff --git a/compat.c b/compat.c
--- a/compat.c
+++ b/compat.c
-@@ -46,6 +46,7 @@ extern int force_change;
+@@ -47,6 +47,7 @@ extern int force_change;
extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
extern int preserve_fileflags;
extern int preserve_acls;
extern int preserve_xattrs;
-@@ -64,7 +65,7 @@ extern char *iconv_opt;
+@@ -65,7 +66,7 @@ extern char *iconv_opt;
#endif
/* These index values are for the file-list's extra-attribute array. */
int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
int sender_symlink_iconv = 0; /* sender should convert symlink content */
-@@ -141,6 +142,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -142,6 +143,8 @@ void setup_protocol(int f_out,int f_in)
uid_ndx = ++file_extra_cnt;
if (preserve_gid)
gid_ndx = ++file_extra_cnt;
extern int relative_paths;
extern int implied_dirs;
extern int ignore_perishable;
-@@ -405,7 +406,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -398,7 +399,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
#endif
int ndx, int first_ndx)
{
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -516,6 +517,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -509,6 +510,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
modtime = file->modtime;
if (NSEC_BUMP(file) && protocol_version >= 31)
xflags |= XMIT_MOD_NSEC;
#ifdef SUPPORT_HARD_LINKS
if (tmp_dev != -1) {
-@@ -600,6 +608,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -593,6 +601,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
}
if (xflags & XMIT_MOD_NSEC)
write_varint(f, F_MOD_NSEC(file));
if (!(xflags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
#ifdef SUPPORT_FILEFLAGS
-@@ -693,7 +703,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+@@ -686,7 +696,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
static mode_t mode;
#ifdef SUPPORT_FILEFLAGS
static uint32 fileflags;
-@@ -838,6 +848,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -835,6 +845,19 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
modtime_nsec = read_varint(f);
else
modtime_nsec = 0;
if (!(xflags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
-@@ -1008,6 +1031,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+@@ -1005,6 +1028,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
F_GROUP(file) = gid;
file->flags |= gid_flags;
}
if (unsort_ndx)
F_NDX(file) = flist->used + flist->ndx_start;
-@@ -1409,6 +1434,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+@@ -1406,6 +1431,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
F_GROUP(file) = st.st_gid;
if (am_generator && st.st_uid == our_uid)
file->flags |= FLAG_OWNED_BY_US;
extern int preserve_hard_links;
extern int preserve_executability;
extern int preserve_fileflags;
-@@ -406,6 +407,13 @@ static inline int ownership_differs(struct file_struct *file, stat_x *sxp)
- return 0;
+@@ -380,8 +381,15 @@ static void do_delete_pass(void)
+ rprintf(FINFO, " \r");
}
+-static inline int time_differs(struct file_struct *file, stat_x *sxp)
++static inline int time_differs(struct file_struct *file, stat_x *sxp, const char *fname)
+ {
+ if (crtimes_ndx) {
+ if (sxp->crtime == 0)
+ sxp->crtime = get_create_time(fname);
+ if (cmp_time(sxp->crtime, f_crtime(file)) != 0)
-+ return 0;
++ return 1;
+ }
+
- #ifdef SUPPORT_ACLS
- static inline int acls_differ(const char *fname, struct file_struct *file, stat_x *sxp)
+ return cmp_time(sxp->st.st_mtime, file->modtime);
+ }
+
+@@ -439,7 +447,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
{
-@@ -501,6 +509,12 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ if (S_ISLNK(file->mode)) {
+ #ifdef CAN_SET_SYMLINK_TIMES
+- if (preserve_times & PRESERVE_LINK_TIMES && time_differs(file, sxp))
++ if (preserve_times & PRESERVE_LINK_TIMES && time_differs(file, sxp, fname))
+ return 0;
+ #endif
+ #ifdef CAN_CHMOD_SYMLINK
+@@ -459,7 +467,7 @@ int unchanged_attrs(const char *fname, struct file_struct *file, stat_x *sxp)
+ return 0;
+ #endif
+ } else {
+- if (preserve_times && time_differs(file, sxp))
++ if (preserve_times && time_differs(file, sxp, fname))
+ return 0;
+ if (perms_differ(file, sxp))
+ return 0;
+@@ -502,6 +510,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;
#if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
if (S_ISLNK(file->mode)) {
;
-@@ -1074,6 +1088,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+@@ -1118,6 +1132,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];
int64 len;
int colwidth = human_readable ? 14 : 11;
-@@ -1089,10 +1104,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1133,10 +1148,12 @@ static void list_file_entry(struct file_struct *f)
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %*s %s %s -> %s\n",
-+ rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
++ rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
permbuf, colwidth, human_num(len),
- timestring(f->modtime), f_name(f, NULL),
- F_SYMLINK(f));
+ timestring(f->modtime),
++ crtimes_ndx ? " " : "",
+ crtimes_ndx ? timestring(crtime) : "",
+ f_name(f, NULL), F_SYMLINK(f));
} else
#endif
if (missing_args == 2 && f->mode == 0) {
-@@ -1100,9 +1116,11 @@ static void list_file_entry(struct file_struct *f)
+@@ -1144,9 +1161,12 @@ 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",
++ rprintf(FINFO, "%s %*s %s%s%s %s\n",
permbuf, colwidth, human_num(len),
- timestring(f->modtime), f_name(f, NULL));
+ timestring(f->modtime),
++ crtimes_ndx ? " " : "",
+ crtimes_ndx ? timestring(crtime) : "",
+ f_name(f, NULL));
}
}
-@@ -1194,6 +1212,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1238,6 +1258,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
return;
}
}
+ sx.crtime = 0;
if (dry_run > 1 || (dry_missing_dir && is_below(file, dry_missing_dir))) {
- parent_is_dry_missing:
+ int i;
diff --git a/ifuncs.h b/ifuncs.h
--- a/ifuncs.h
+++ b/ifuncs.h
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
-@@ -734,7 +734,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -723,7 +723,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';
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -708,6 +709,7 @@ void usage(enum logcode F)
+@@ -716,6 +717,7 @@ void usage(enum logcode F)
rprintf(F," --specials preserve special files\n");
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");
rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
rprintf(F," --super receiver attempts super-user activities\n");
-@@ -866,6 +868,9 @@ static struct poptOption long_options[] = {
+@@ -883,6 +885,9 @@ static struct poptOption long_options[] = {
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"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 },
-@@ -2382,6 +2387,8 @@ void server_options(char **args, int *argc_p)
+@@ -2445,6 +2450,8 @@ void server_options(char **args, int *argc_p)
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
diff --git a/rsync.c b/rsync.c
--- a/rsync.c
+++ b/rsync.c
-@@ -525,6 +525,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -581,6 +581,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
|| (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
|| (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
flags |= ATTRS_SKIP_MTIME;
if (!(flags & ATTRS_SKIP_MTIME)
&& cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode, ST_FLAGS(sxp->st));
-@@ -538,6 +541,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -594,6 +597,14 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
else
file->flags |= FLAG_TIME_FAILED;
}
+ updated = 1;
+ }
- change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
- change_gid = gid_ndx && !(file->flags & FLAG_SKIP_GROUP)
-@@ -688,7 +699,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ #ifdef SUPPORT_ACLS
+ /* It's OK to call set_acl() now, even for a dir, as the generator
+@@ -710,7 +721,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
/* move tmp file over real file */
if (DEBUG_GTE(RECV, 1))
-@@ -717,7 +728,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -739,7 +750,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
do_set_file_attrs:
set_file_attrs(fnametmp, file, NULL, fnamecmp,
#define ITEM_REPORT_CHANGE (1<<1)
#define ITEM_REPORT_SIZE (1<<2) /* regular files only */
#define ITEM_REPORT_TIMEFAIL (1<<2) /* symlinks only */
-@@ -708,6 +710,7 @@ extern int file_extra_cnt;
+@@ -733,6 +735,7 @@ extern int file_extra_cnt;
extern int inc_recurse;
extern int uid_ndx;
extern int gid_ndx;
extern int fileflags_ndx;
extern int acls_ndx;
extern int xattrs_ndx;
-@@ -715,6 +718,7 @@ extern int xattrs_ndx;
+@@ -740,6 +743,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)
#define DEV_EXTRA_CNT 2
#define DIRNODE_EXTRA_CNT 3
#define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
-@@ -994,6 +998,7 @@ typedef struct {
+@@ -1021,6 +1025,7 @@ typedef struct {
typedef struct {
STRUCT_STAT st;
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb(
+@@ -370,6 +370,7 @@ to the detailed description below for a complete description. verb(
--specials preserve special files
-D same as --devices --specials
-t, --times preserve modification times
-O, --omit-dir-times omit directories from --times
-J, --omit-link-times omit symlinks from --times
--super receiver attempts super-user activities
-@@ -1152,6 +1153,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
+@@ -1190,6 +1191,9 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
updated (though rsync's delta-transfer algorithm will make the update fairly efficient
if the files haven't actually changed, you're much better off using bf(-t)).
dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
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).
-@@ -1983,7 +1987,7 @@ with older versions of rsync, but that also turns on the output of other
+@@ -2065,7 +2069,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
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.
-@@ -2042,6 +2046,8 @@ quote(itemization(
+@@ -2124,6 +2128,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.
diff --git a/syscall.c b/syscall.c
--- a/syscall.c
+++ b/syscall.c
-@@ -38,6 +38,14 @@ extern int force_change;
+@@ -42,6 +42,13 @@ extern int force_change;
extern int preserve_perms;
extern int preserve_executability;
-+#pragma pack(push)
-+#pragma pack(4)
++#pragma pack(push, 4)
+struct create_time {
+ uint32 length;
+ struct timespec crtime;
#define RETURN_ERROR_IF(x,e) \
do { \
if (x) { \
-@@ -456,6 +464,36 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
+@@ -460,6 +467,36 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
#endif
}
+all_plus='++++++++++'
+allspace=' '
+dots='......' # trailing dots after changes
+ tab_ch=' ' # a single tab character
# Berkley's nice.
- PATH="$PATH:/usr/ucb"
diff --git a/tls.c b/tls.c
--- a/tls.c
+++ b/tls.c
-@@ -118,6 +118,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
+@@ -109,6 +109,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
#endif
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -125,16 +127,44 @@ static void failed(char const *what, char const *where)
+@@ -116,16 +118,44 @@ static void failed(char const *what, char const *where)
exit(1);
}
+ (int)mt->tm_hour,
+ (int)mt->tm_min,
+ (int)mt->tm_sec);
-+ if (nsecs >= 0) {
-+ snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs);
-+ }
++ if (nsecs >= 0 && len >= 0)
++ snprintf(dest + len, destsize - len, ".%09d", nsecs);
+ } else {
+ int has_nsecs = nsecs >= 0 ? 1 : 0;
-+ int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
-+ memset(datebuf, ' ', len);
-+ datebuf[len] = '\0';
++ int len = MIN(19 + 9*has_nsecs, (int)destsize - 1);
++ memset(dest, ' ', len);
++ dest[len] = '\0';
+ }
+}
+
+ char mtimebuf[50];
+ char crtimebuf[50];
char linkbuf[4096];
++ int nsecs;
if (do_lstat(fname, &buf) < 0)
failed("stat", fname);
#ifdef SUPPORT_XATTRS
if (am_root < 0)
stat_xattr(fname, &buf);
-@@ -169,29 +199,11 @@ static void list_file(const char *fname)
+@@ -159,30 +189,17 @@ static void list_file(const char *fname)
+ }
permstring(permbuf, buf.st_mode);
-
+-
- if (buf.st_mtime) {
- int len;
- mt = gmtime(&buf.st_mtime);
- (int)mt->tm_hour,
- (int)mt->tm_min,
- (int)mt->tm_sec);
--#ifdef ST_MTIME_NSEC
+ #ifdef ST_MTIME_NSEC
- if (nsec_times) {
- snprintf(datebuf + len, sizeof datebuf - len,
- ".%09d", (int)buf.ST_MTIME_NSEC);
- }
--#endif
++ if (nsec_times)
++ nsecs = (int)buf.ST_MTIME_NSEC;
++ else
+ #endif
- } else {
- int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
- memset(datebuf, ' ', len);
- datebuf[len] = '\0';
- }
++ nsecs = -1;
+ storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
+ if (display_crtimes)
+ storetime(crtimebuf, sizeof crtimebuf, crtime, -1);
/* TODO: Perhaps escape special characters in fname? */
-@@ -202,13 +214,14 @@ static void list_file(const char *fname)
+@@ -193,13 +210,14 @@ static void list_file(const char *fname)
(long)minor(buf.st_rdev));
} else
printf("%15s", do_big_num(buf.st_size, 1, NULL));
{"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
-@@ -227,6 +240,7 @@ static void tls_usage(int ret)
+@@ -218,6 +236,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");
git.samba.org / rsync-patches.git / blobdiff