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
Fixed a failing hunk.
[rsync/rsync-patches.git]
/
id-pair.diff
diff --git
a/id-pair.diff
b/id-pair.diff
index
8fa4fac
..
30bd52c
100644
(file)
--- a/
id-pair.diff
+++ b/
id-pair.diff
@@
-18,7
+18,7
@@
gets to be really large.
extern struct file_list *the_file_list;
extern char curr_dir[MAXPATHLEN];
extern struct file_list *the_file_list;
extern char curr_dir[MAXPATHLEN];
-@@ -3
55,14 +356
,14 @@ static void send_file_entry(struct file_
+@@ -3
47,14 +348
,14 @@ static void send_file_entry(struct file_
}
} else if (protocol_version < 28)
rdev = makedev(0, 0);
}
} else if (protocol_version < 28)
rdev = makedev(0, 0);
@@
-37,7
+37,7
@@
gets to be really large.
if (file->modtime == modtime)
flags |= XMIT_SAME_TIME;
else
if (file->modtime == modtime)
flags |= XMIT_SAME_TIME;
else
-@@ -6
13,8 +614
,7 @@ static struct file_struct *receive_file_
+@@ -6
05,8 +606
,7 @@ static struct file_struct *receive_file_
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
file->modtime = modtime;
file->length = file_length;
file->mode = mode;
@@
-47,7
+47,7
@@
gets to be really large.
if (dirname_len) {
file->dirname = lastdir = bp;
if (dirname_len) {
file->dirname = lastdir = bp;
-@@ -8
65,8 +86
5,7 @@ struct file_struct *make_file(char *fnam
+@@ -8
55,8 +85
5,7 @@ struct file_struct *make_file(char *fnam
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
file->modtime = st.st_mtime;
file->length = st.st_size;
file->mode = st.st_mode;
@@
-57,7
+57,7
@@
gets to be really large.
#ifdef SUPPORT_HARD_LINKS
if (flist && flist->hlink_pool) {
#ifdef SUPPORT_HARD_LINKS
if (flist && flist->hlink_pool) {
-@@ -9
34,8 +93
3,7 @@ struct file_struct *make_file(char *fnam
+@@ -9
24,8 +92
3,7 @@ struct file_struct *make_file(char *fnam
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
file->modtime = st2.st_mtime;
file->length = st2.st_size;
file->mode = st2.st_mode;
@@
-67,7
+67,7
@@
gets to be really large.
file->u.link = NULL;
} else
file->mode = save_mode;
file->u.link = NULL;
} else
file->mode = save_mode;
-@@ -137
9,7 +1377
,7 @@ struct file_list *recv_file_list(int f)
+@@ -137
5,7 +1373
,7 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
clean_flist(flist, relative_paths, 1);
if (f >= 0) {
@@
-76,7
+76,7
@@
gets to be really large.
/* Recv the io_error flag */
if (lp_ignore_errors(module_id) || ignore_errors)
/* Recv the io_error flag */
if (lp_ignore_errors(module_id) || ignore_errors)
-@@ -169
5,13 +1693
,15 @@ static void output_flist(struct file_lis
+@@ -169
1,13 +1689
,15 @@ static void output_flist(struct file_lis
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
for (i = 0; i < flist->count; i++) {
file = flist->files[i];
@@
-148,15
+148,15
@@
gets to be really large.
iflags |= ITEM_IS_NEW;
--- old/log.c
+++ new/log.c
iflags |= ITEM_IS_NEW;
--- old/log.c
+++ new/log.c
-@@ -43,6 +43,7 @@ extern int daemon_log_format_has_o_or_i;
- extern mode_t orig_umask;
- extern char *auth_user;
+@@ -45,6 +45,7 @@ extern char *auth_user;
extern char *log_format;
extern char *log_format;
+ extern char *logfile_format;
+ extern char *logfile_name;
+extern struct id_pair *id_pairs;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
extern iconv_t ic_chck;
#endif
+extern struct id_pair *id_pairs;
#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
extern iconv_t ic_chck;
#endif
-@@ -4
75,16 +476
,16 @@ static void log_formatted(enum logcode c
+@@ -4
64,16 +465
,16 @@ static void log_formatted(enum logcode c
case 'U':
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
case 'U':
strlcat(fmt, "ld", sizeof fmt);
snprintf(buf2, sizeof buf2, fmt,
@@
-235,7
+235,7
@@
gets to be really large.
rsyserr(FERROR, errno, "%s %s failed",
--- old/rsync.h
+++ new/rsync.h
rsyserr(FERROR, errno, "%s %s failed",
--- old/rsync.h
+++ new/rsync.h
-@@ -49
5,6 +495
,11 @@ struct hlink {
+@@ -49
6,6 +496
,11 @@ struct hlink {
int hlindex;
};
int hlindex;
};
@@
-247,7
+247,7
@@
gets to be really large.
#define F_DEV link_u.idev->dev
#define F_INODE link_u.idev->inode
#define F_DEV link_u.idev->dev
#define F_INODE link_u.idev->inode
-@@ -5
19,8 +524
,7 @@ struct file_struct {
+@@ -5
20,8 +525
,7 @@ struct file_struct {
struct hlink *links;
} link_u;
time_t modtime;
struct hlink *links;
} link_u;
time_t modtime;