Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix failing hunks.
[rsync/rsync-patches.git]
/
atimes.diff
diff --git
a/atimes.diff
b/atimes.diff
index
cc20796
..
db78a51
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-4,9
+4,9
@@
command before "make":
make proto
make proto
---- orig/batch.c 2004-0
5-15 20:10:13
+--- orig/batch.c 2004-0
7-24 16:52:09
+++ batch.c 2004-07-03 20:15:41
+++ batch.c 2004-07-03 20:15:41
-@@ -
335,6 +335
,8 @@ void show_flist(int index, struct file_s
+@@ -
186,6 +186
,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->flags=%#x\n", fptr[i]->flags);
rprintf(FINFO, "flist->modtime=%#lx\n",
(long unsigned) fptr[i]->modtime);
@@
-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);
rprintf(FINFO, "flist->length=%.0f\n",
(double) fptr[i]->length);
rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c 2004-0
6-18 16:23:07
+--- orig/flist.c 2004-0
7-17 15:20:05
+++ flist.c 2004-07-03 20:15:41
@@ -58,6 +58,7 @@ extern int relative_paths;
extern int implied_dirs;
+++ flist.c 2004-07-03 20:15:41
@@ -58,6 +58,7 @@ extern int relative_paths;
extern int implied_dirs;
@@
-25,7
+25,7
@@
command before "make":
extern int protocol_version;
extern int sanitize_paths;
extern int delete_excluded;
extern int protocol_version;
extern int sanitize_paths;
extern int delete_excluded;
-@@ -14
4,17 +145
,17 @@ static void list_file_entry(struct file_
+@@ -14
1,17 +142
,17 @@ static void list_file_entry(struct file_
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
#if SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
@@
-47,7
+47,7
@@
command before "make":
}
}
}
}
-@@ -33
5,6 +336
,7 @@ void send_file_entry(struct file_struct
+@@ -33
2,6 +333
,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
{
unsigned short flags;
static time_t modtime;
@@
-55,7
+55,7
@@
command before "make":
static mode_t mode;
static uint64 dev;
static dev_t rdev;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -3
50,7 +352
,7 @@ void send_file_entry(struct file_struct
+@@ -3
47,7 +349
,7 @@ void send_file_entry(struct file_struct
if (!file) {
write_byte(f, 0);
if (!file) {
write_byte(f, 0);
@@
-64,7
+64,7
@@
command before "make":
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -39
9,6 +401
,12 @@ void send_file_entry(struct file_struct
+@@ -39
6,6 +398
,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
@@
-77,7
+77,7
@@
command before "make":
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -45
4,6 +462
,8 @@ void send_file_entry(struct file_struct
+@@ -45
1,6 +459
,8 @@ void send_file_entry(struct file_struct
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
write_int(f, modtime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
@@
-86,7
+86,7
@@
command before "make":
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
if (!numeric_ids)
add_uid(uid);
-@@ -52
7,6 +537
,7 @@ void receive_file_entry(struct file_stru
+@@ -52
4,6 +534
,7 @@ void receive_file_entry(struct file_stru
struct file_list *flist, int f)
{
static time_t modtime;
struct file_list *flist, int f)
{
static time_t modtime;
@@
-94,7
+94,7
@@
command before "make":
static mode_t mode;
static uint64 dev;
static dev_t rdev;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
-@@ -54
3,7 +554
,7 @@ void receive_file_entry(struct file_stru
+@@ -54
0,7 +551
,7 @@ void receive_file_entry(struct file_stru
struct file_struct *file;
if (!fptr) {
struct file_struct *file;
if (!fptr) {
@@
-103,7
+103,7
@@
command before "make":
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
dev = 0, rdev = makedev(0, 0);
rdev_major = 0;
uid = 0, gid = 0;
-@@ -59
8,6 +609
,8 @@ void receive_file_entry(struct file_stru
+@@ -59
5,6 +606
,8 @@ void receive_file_entry(struct file_stru
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
modtime = (time_t)read_int(f);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
@@
-112,7
+112,7
@@
command before "make":
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
if (preserve_uid && !(flags & XMIT_SAME_UID))
uid = (uid_t)read_int(f);
-@@ -64
8,6 +661
,7 @@ void receive_file_entry(struct file_stru
+@@ -64
5,6 +658
,7 @@ void receive_file_entry(struct file_stru
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
file->modtime = modtime;
@@
-120,7
+120,7
@@
command before "make":
file->length = file_length;
file->mode = mode;
file->uid = uid;
file->length = file_length;
file->mode = mode;
file->uid = uid;
-@@ -86
7,6 +881
,7 @@ skip_excludes:
+@@ -86
4,6 +878
,7 @@ skip_excludes:
file->flags = flags;
file->modtime = st.st_mtime;
file->flags = flags;
file->modtime = st.st_mtime;
@@
-128,9
+128,9
@@
command before "make":
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
file->length = st.st_size;
file->mode = st.st_mode;
file->uid = st.st_uid;
---- orig/generator.c 2004-0
6-30 07:24:45
+--- orig/generator.c 2004-0
7-28 10:05:29
+++ generator.c 2004-07-03 20:15:41
+++ generator.c 2004-07-03 20:15:41
-@@ -9
9,7 +99
,7 @@ static int skip_file(char *fname, struct
+@@ -9
8,7 +98
,7 @@ static int skip_file(char *fname, struct
if (ignore_times)
return 0;
if (ignore_times)
return 0;
@@
-139,16
+139,16
@@
command before "make":
}
}
-@@ -4
84,7 +484
,7 @@ static void recv_generator(char *fname,
+@@ -4
73,7 +473
,7 @@ static void recv_generator(char *fname,
}
if (update_only && fnamecmp == fname
- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
+ && cmp_time(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
}
if (update_only && fnamecmp == fname
- && cmp_modtime(st.st_mtime, file->modtime) > 0) {
+ && cmp_time(st.st_mtime, file->modtime) > 0) {
if (verbose > 1)
- rprintf(FINFO,
"%s is newer\n",fname
);
+ rprintf(FINFO,
"%s is newer\n", safe_fname(fname)
);
return;
return;
---- orig/options.c 2004-0
6-20 19:30:00
+--- orig/options.c 2004-0
7-23 17:16:13
+++ options.c 2004-07-03 20:15:41
@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
+++ options.c 2004-07-03 20:15:41
@@ -48,6 +48,7 @@ int preserve_devices = 0;
int preserve_uid = 0;
@@
-158,7
+158,7
@@
command before "make":
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
int update_only = 0;
int cvs_exclude = 0;
int dry_run = 0;
-@@ -2
45,6 +246
,7 @@ void usage(enum logcode F)
+@@ -2
52,6 +253
,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," -g, --group preserve group\n");
rprintf(F," -D, --devices preserve devices (root only)\n");
rprintf(F," -t, --times preserve times\n");
@@
-166,7
+166,7
@@
command before "make":
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
-@@ -3
52,6 +354
,7 @@ static struct poptOption long_options[]
+@@ -3
60,6 +362
,7 @@ static struct poptOption long_options[]
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
@@
-174,7
+174,7
@@
command before "make":
{"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 },
{"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 },
-@@ -8
41,6 +84
4,8 @@ void server_options(char **args,int *arg
+@@ -8
81,6 +88
4,8 @@ void server_options(char **args,int *arg
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
@@
-183,7
+183,7
@@
command before "make":
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
---- orig/rsync.c 2004-07-
02 18:06:32
+--- orig/rsync.c 2004-07-
26 16:06:53
+++ rsync.c 2004-07-03 20:15:41
@@ -25,6 +25,7 @@
extern int verbose;
+++ rsync.c 2004-07-03 20:15:41
@@ -25,6 +25,7 @@
extern int verbose;
@@
-193,7
+193,7
@@
command before "make":
extern int am_root;
extern int am_sender;
extern int am_generator;
extern int am_root;
extern int am_sender;
extern int am_generator;
-@@ -14
3,17 +144
,31 @@ int set_perms(char *fname,struct file_st
+@@ -14
4,17 +145
,31 @@ int set_perms(char *fname,struct file_st
if (!preserve_times || S_ISLNK(st->st_mode)
|| (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
flags |= PERMS_SKIP_MTIME;
if (!preserve_times || S_ISLNK(st->st_mode)
|| (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
flags |= PERMS_SKIP_MTIME;
@@
-229,7
+229,7
@@
command before "make":
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
}
change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h 2004-0
5-16 07:58:12
+--- orig/rsync.h 2004-0
7-23 17:16:13
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
+++ rsync.h 2004-07-03 20:15:41
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
@@
-255,9
+255,9
@@
command before "make":
uid_t uid;
gid_t gid;
mode_t mode;
uid_t uid;
gid_t gid;
mode_t mode;
---- orig/rsync.yo 2004-0
6-17 06:32:0
0
+--- orig/rsync.yo 2004-0
7-24 16:52:1
0
+++ rsync.yo 2004-07-03 20:15:41
+++ rsync.yo 2004-07-03 20:15:41
-@@ -30
0,6 +300
,7 @@ verb(
+@@ -30
1,6 +301
,7 @@ verb(
-g, --group preserve group
-D, --devices preserve devices (root only)
-t, --times preserve times
-g, --group preserve group
-D, --devices preserve devices (root only)
-t, --times preserve times
@@
-265,7
+265,7
@@
command before "make":
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy whole files, no incremental checks
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy whole files, no incremental checks
-@@ -5
52,6 +553
,11 @@ cause the next transfer to behave as if
+@@ -5
67,6 +568
,11 @@ cause the next transfer to behave as if
their checksums compared and show up in log messages even if they haven't
changed.
their checksums compared and show up in log messages even if they haven't
changed.
@@
-299,7
+299,7
@@
command before "make":
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
---- orig/testsuite/rsync.fns 2004-0
6-28 21:08:14
+--- orig/testsuite/rsync.fns 2004-0
7-23 17:16:13
+++ testsuite/rsync.fns 2004-07-03 20:15:41
@@ -50,7 +50,7 @@ printmsg() {
+++ testsuite/rsync.fns 2004-07-03 20:15:41
@@ -50,7 +50,7 @@ printmsg() {
@@
-482,7
+482,7
@@
command before "make":
return 0;
}
return 0;
}
---- orig/util.c 2004-0
6-09 21:54:47
+--- orig/util.c 2004-0
7-26 16:33:24
+++ util.c 2004-07-03 20:15:41
@@ -127,31 +127,39 @@ void overflow(char *str)
+++ util.c 2004-07-03 20:15:41
@@ -127,31 +127,39 @@ void overflow(char *str)
@@
-530,7
+530,7
@@
command before "make":
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
t[0].tv_usec = 0;
t[1].tv_sec = modtime;
t[1].tv_usec = 0;
-@@ -1
078,8 +1086
,8 @@ int msleep(int t)
+@@ -1
103,8 +1111
,8 @@ int msleep(int t)
/**
/**
@@
-541,7
+541,7
@@
command before "make":
* --modify-window).
*
* @retval 0 if the times should be treated as the same
* --modify-window).
*
* @retval 0 if the times should be treated as the same
-@@ -1
088,7 +1096
,7 @@ int msleep(int t)
+@@ -1
113,7 +1121
,7 @@ int msleep(int t)
*
* @retval -1 if the 2nd is later
**/
*
* @retval -1 if the 2nd is later
**/
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff