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
Changed f_name() to new syntax.
[rsync/rsync-patches.git]
/
atimes.diff
diff --git
a/atimes.diff
b/atimes.diff
index
7ca9204
..
4dad92d
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-15,8
+15,8
@@
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 2006-01-1
4 08:14:30
-+++ flist.c 2006-01-1
4 08:19:03
+--- orig/flist.c 2006-01-1
7 02:15:59
++++ flist.c 2006-01-1
7 02:42:04
@@ -50,6 +50,7 @@ extern int preserve_perms;
extern int preserve_devices;
extern int preserve_uid;
@@ -50,6 +50,7 @@ extern int preserve_perms;
extern int preserve_devices;
extern int preserve_uid;
@@
-25,7
+25,7
@@
command before "make":
extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
extern int relative_paths;
extern int implied_dirs;
extern int copy_links;
-@@ -1
40,16 +141
,18 @@ static void list_file_entry(struct file_
+@@ -1
39,16 +140
,18 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
@@
-34,7
+34,7
@@
command before "make":
perms,
(double)f->length, timestring(f->modtime),
+ timestring(f->atime),
perms,
(double)f->length, timestring(f->modtime),
+ timestring(f->atime),
- f_name(f), f->u.link);
+ f_name(f
, NULL
), f->u.link);
} else
#endif
{
} else
#endif
{
@@
-43,10
+43,10
@@
command before "make":
perms,
(double)f->length, timestring(f->modtime),
+ timestring(f->atime),
perms,
(double)f->length, timestring(f->modtime),
+ timestring(f->atime),
- f_name(f));
+ f_name(f
, NULL
));
}
}
}
}
-@@ -31
1,6 +314
,7 @@ void send_file_entry(struct file_struct
+@@ -31
0,6 +313
,7 @@ void send_file_entry(struct file_struct
{
unsigned short flags;
static time_t modtime;
{
unsigned short flags;
static time_t modtime;
@@
-54,7
+54,7
@@
command before "make":
static mode_t mode;
static int64 dev;
static dev_t rdev;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -32
6,7 +330
,7 @@ void send_file_entry(struct file_struct
+@@ -32
5,7 +329
,7 @@ void send_file_entry(struct file_struct
if (!file) {
write_byte(f, 0);
if (!file) {
write_byte(f, 0);
@@
-63,7
+63,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;
-@@ -37
5,6 +379
,12 @@ void send_file_entry(struct file_struct
+@@ -37
4,6 +378
,12 @@ void send_file_entry(struct file_struct
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
@@
-76,7
+76,7
@@
command before "make":
#ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
#ifdef SUPPORT_HARD_LINKS
if (file->link_u.idev) {
-@@ -42
8,6 +438
,8 @@ void send_file_entry(struct file_struct
+@@ -42
7,6 +437
,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));
@@
-85,7
+85,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);
-@@ -49
5,6 +507
,7 @@ static struct file_struct *receive_file_
+@@ -49
4,6 +506
,7 @@ static struct file_struct *receive_file_
unsigned short flags, int f)
{
static time_t modtime;
unsigned short flags, int f)
{
static time_t modtime;
@@
-93,7
+93,7
@@
command before "make":
static mode_t mode;
static int64 dev;
static dev_t rdev;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -51
3,7 +526
,7 @@ static struct file_struct *receive_file_
+@@ -51
2,7 +525
,7 @@ static struct file_struct *receive_file_
struct file_struct *file;
if (!flist) {
struct file_struct *file;
if (!flist) {
@@
-102,7
+102,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;
-@@ -56
9,6 +582
,8 @@ static struct file_struct *receive_file_
+@@ -56
8,6 +581
,8 @@ static struct file_struct *receive_file_
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));
@@
-111,7
+111,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);
-@@ -61
9,6 +634
,7 @@ static struct file_struct *receive_file_
+@@ -61
8,6 +633
,7 @@ static struct file_struct *receive_file_
file->flags = 0;
file->modtime = modtime;
file->flags = 0;
file->modtime = modtime;
@@
-119,7
+119,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
6,6 +882
,7 @@ struct file_struct *make_file(char *fnam
+@@ -86
4,6 +880
,7 @@ struct file_struct *make_file(char *fnam
file->flags = flags;
file->modtime = st.st_mtime;
file->flags = flags;
file->modtime = st.st_mtime;
@@
-127,7
+127,7
@@
command before "make":
file->length = st.st_size;
if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
file->mode = tweak_mode(st.st_mode, chmod_modes);
file->length = st.st_size;
if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
file->mode = tweak_mode(st.st_mode, chmod_modes);
---- orig/generator.c 2006-01-14
08:14:30
+--- orig/generator.c 2006-01-14
20:27:09
+++ generator.c 2005-12-15 23:05:32
@@ -44,6 +44,7 @@ extern int preserve_uid;
extern int preserve_gid;
+++ generator.c 2005-12-15 23:05:32
@@ -44,6 +44,7 @@ extern int preserve_uid;
extern int preserve_gid;
@@
-186,7
+186,7
@@
command before "make":
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
if (verbose > 1)
rprintf(FINFO, "%s is newer\n", fname);
return;
---- orig/log.c 2006-01-1
4 08:14:3
0
+--- orig/log.c 2006-01-1
7 02:16:4
0
+++ log.c 2005-12-15 23:05:44
@@ -38,6 +38,7 @@ extern int module_id;
extern int msg_fd_out;
+++ log.c 2005-12-15 23:05:44
@@ -38,6 +38,7 @@ extern int module_id;
extern int msg_fd_out;
@@
-196,7
+196,7
@@
command before "make":
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_o_or_i;
extern int log_format_has_i;
extern int log_format_has_o_or_i;
extern int daemon_log_format_has_o_or_i;
-@@ -5
17,11 +518
,14 @@ static void log_formatted(enum logcode c
+@@ -5
42,11 +543
,14 @@ static void log_formatted(enum logcode c
n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
: !preserve_times || IS_DEVICE(file->mode)
|| S_ISLNK(file->mode) ? 'T' : 't';
n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
: !preserve_times || IS_DEVICE(file->mode)
|| S_ISLNK(file->mode) ? 'T' : 't';
@@
-309,7
+309,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 2006-01-14
08:14:31
+--- orig/rsync.h 2006-01-14
20:27:10
+++ rsync.h 2005-07-28 00:04:51
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
+++ rsync.h 2005-07-28 00:04:51
@@ -54,6 +54,7 @@
#define XMIT_HAS_IDEV_DATA (1<<9)
@@
-335,7
+335,7
@@
command before "make":
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
#define ITEM_REPORT_TIME (1<<3)
#define ITEM_REPORT_CHECKSUM (1<<1)
#define ITEM_REPORT_SIZE (1<<2)
#define ITEM_REPORT_TIME (1<<3)
-@@ -51
6,6 +519
,7 @@ struct file_struct {
+@@ -51
7,6 +520
,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
struct hlink *links;
} link_u;
time_t modtime;