make proto
---- orig/batch.c 2004-08-02 05:02:24
+--- orig/batch.c 2005-02-03 02:04:20
+++ batch.c 2004-07-03 20:15:41
-@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s
+@@ -204,6 +204,8 @@ void show_flist(int index, struct file_s
rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
rprintf(FINFO, "flist->modtime=%#lx\n",
(long unsigned) fptr[i]->modtime);
rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2005-01-25 00:53:58
-+++ flist.c 2004-07-03 20:15:41
+--- orig/flist.c 2005-02-03 02:04:20
++++ flist.c 2005-02-01 10:42:59
@@ -63,6 +63,7 @@ extern int make_backups;
extern int backup_suffix_len;
extern int copy_links;
extern int protocol_version;
extern int sanitize_paths;
extern int delete_excluded;
-@@ -147,17 +148,17 @@ static void list_file_entry(struct file_
+@@ -150,17 +151,17 @@ static void list_file_entry(struct file_
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
}
}
-@@ -333,6 +334,7 @@ void send_file_entry(struct file_struct
+@@ -323,6 +324,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -348,7 +350,7 @@ void send_file_entry(struct file_struct
+@@ -338,7 +340,7 @@ void send_file_entry(struct file_struct
if (!file) {
write_byte(f, 0);
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -397,6 +399,12 @@ void send_file_entry(struct file_struct
+@@ -387,6 +389,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -452,6 +460,8 @@ void send_file_entry(struct file_struct
+@@ -442,6 +450,8 @@ void send_file_entry(struct file_struct
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -525,6 +535,7 @@ void receive_file_entry(struct file_stru
- struct file_list *flist, int f)
+@@ -515,6 +525,7 @@ static void receive_file_entry(struct fi
+ unsigned short flags, int f)
{
static time_t modtime;
+ static time_t atime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru
+@@ -533,7 +544,7 @@ static void receive_file_entry(struct fi
struct file_struct *file;
- if (!fptr) {
+ if (!flist) {
- modtime = 0, mode = 0;
+ modtime = 0, atime = 0, mode = 0;
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -599,6 +610,8 @@ void receive_file_entry(struct file_stru
+@@ -589,6 +600,8 @@ static void receive_file_entry(struct fi
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
-@@ -649,6 +662,7 @@ void receive_file_entry(struct file_stru
+@@ -639,6 +652,7 @@ static void receive_file_entry(struct fi
file->flags = 0;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -889,6 +903,7 @@ skip_excludes:
+@@ -885,6 +899,7 @@ skip_filters:
file->flags = flags;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2005-01-24 06:20:37
+--- orig/generator.c 2005-02-03 02:04:20
+++ generator.c 2004-11-03 23:02:12
@@ -99,7 +99,7 @@ static int unchanged_file(char *fn, stru
if (ignore_times)
}
-@@ -499,7 +499,7 @@ static void recv_generator(char *fname,
+@@ -497,7 +497,7 @@ static void recv_generator(char *fname,
}
if (update_only && fnamecmp_type == FNAMECMP_FNAME
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", safe_fname(fname));
return;
---- orig/options.c 2005-01-25 03:26:51
+--- orig/options.c 2005-02-01 10:39:22
+++ options.c 2005-01-24 01:51:48
-@@ -49,6 +49,7 @@ int preserve_uid = 0;
+@@ -50,6 +50,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int omit_dir_times = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -266,6 +267,7 @@ void usage(enum logcode F)
+@@ -270,6 +271,7 @@ void usage(enum logcode F)
rprintf(F," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -t, --times preserve times\n");
rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
-@@ -382,6 +384,7 @@ static struct poptOption long_options[]
+@@ -389,6 +391,7 @@ static struct poptOption long_options[]
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_NONE, &omit_dir_times, 0, 0, 0 },
{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
-@@ -1128,6 +1131,8 @@ void server_options(char **args,int *arg
+@@ -1152,6 +1155,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
if (omit_dir_times && am_sender)
argstr[x++] = 'O';
if (preserve_perms)
---- orig/rsync.c 2005-01-24 00:57:24
+--- orig/rsync.c 2005-02-01 10:39:22
+++ rsync.c 2005-01-24 01:59:12
@@ -26,6 +26,7 @@ extern int verbose;
extern int dry_run;
extern int omit_dir_times;
+extern int copy_atimes;
extern int am_root;
+ extern int am_server;
extern int am_sender;
- extern int am_generator;
-@@ -153,6 +154,7 @@ int set_perms(char *fname,struct file_st
+@@ -155,6 +156,7 @@ int set_perms(char *fname,struct file_st
int updated = 0;
STRUCT_STAT st2;
int change_uid, change_gid;
if (!st) {
if (dry_run)
-@@ -165,18 +167,28 @@ int set_perms(char *fname,struct file_st
+@@ -167,18 +169,28 @@ int set_perms(char *fname,struct file_st
st = &st2;
}
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2005-01-25 00:53:58
+--- orig/rsync.h 2005-02-03 02:04:20
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
/* These flags are used in the live flist data. */
-@@ -117,6 +118,7 @@
+@@ -118,6 +119,7 @@
#define PERMS_REPORT (1<<0)
#define PERMS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -435,6 +437,7 @@ struct file_struct {
+@@ -485,6 +487,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2005-01-25 03:26:51
+--- orig/rsync.yo 2005-02-01 10:39:23
+++ rsync.yo 2005-01-24 01:57:18
-@@ -332,6 +332,7 @@ verb(
+@@ -322,6 +322,7 @@ to the detailed description below for a
-D, --devices preserve devices (root only)
-t, --times preserve times
-O, --omit-dir-times omit directories when preserving times
+ -A, --copy-atimes copy access times
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
- -W, --whole-file copy whole files, no incremental checks
-@@ -648,6 +649,11 @@ dit(bf(-O, --omit-dir-times)) This tells
- it is preserving modification times (see --times). If NFS is sharing
- the directories on the receiving side, it is a good idea to use -O.
+ -W, --whole-file copy files whole
+@@ -641,6 +642,11 @@ dit(bf(-O, --omit-dir-times)) This tells
+ 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).
+dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
+along with the files and update them on the remote system. Note that
return 0;
}
---- orig/util.c 2005-01-20 23:05:34
+--- orig/util.c 2005-01-28 19:08:20
+++ util.c 2005-01-21 18:56:05
@@ -128,12 +128,20 @@ void overflow(char *str)
if (dry_run)
@@ -142,17 +150,17 @@ int set_modtime(char *fname, time_t modt
{
- #ifdef HAVE_UTIMBUF
+ #if HAVE_UTIMBUF
struct utimbuf tbuf;
- tbuf.actime = time(NULL);
+ tbuf.actime = atime;
tbuf.modtime = modtime;
return utime(fname,&tbuf);
- #elif defined(HAVE_UTIME)
+ #elif HAVE_UTIME
time_t t[2];
- t[0] = time(NULL);
+ t[0] = atime;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff