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
4caf5fd
..
30bd52c
100644
(file)
--- a/
id-pair.diff
+++ b/
id-pair.diff
@@
-10,15
+10,15
@@
gets to be really large.
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -60,6 +60,7 @@ extern int protocol_version;
+@@ -54,6 +54,7 @@ extern int copy_unsafe_links;
+ extern int protocol_version;
extern int sanitize_paths;
extern int sanitize_paths;
- extern const char *io_write_phase;
extern struct stats stats;
+extern struct id_pair *id_pairs;
extern struct file_list *the_file_list;
extern char curr_dir[MAXPATHLEN];
extern struct stats stats;
+extern struct id_pair *id_pairs;
extern struct file_list *the_file_list;
extern char curr_dir[MAXPATHLEN];
-@@ -3
63,14 +364
,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
23,8 +624
,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
75,8 +87
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
44,8 +94
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;
-@@ -13
89,7 +1387
,7 @@ struct file_list *recv_file_list(int f)
+@@ -13
75,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)
-@@ -1
705,13 +1703
,15 @@ static void output_flist(struct file_lis
+@@ -1
691,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];
@@
-100,7
+100,7
@@
gets to be really large.
sprintf(depthbuf, "%d", file->dir.depth);
--- old/generator.c
+++ new/generator.c
sprintf(depthbuf, "%d", file->dir.depth);
--- old/generator.c
+++ new/generator.c
-@@ -9
1,6 +91
,7 @@ extern dev_t filesystem_dev;
+@@ -9
0,6 +90
,7 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
@@
-108,7
+108,7
@@
gets to be really large.
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
-@@ -32
6,10 +327
,12 @@ int unchanged_attrs(struct file_struct *
+@@ -32
3,10 +324
,12 @@ int unchanged_attrs(struct file_struct *
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 0;
&& (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
return 0;
@@
-123,7
+123,7
@@
gets to be really large.
return 0;
return 1;
return 0;
return 1;
-@@ -3
42,6 +345
,8 @@ void itemize(struct file_struct *file, i
+@@ -3
39,6 +342
,8 @@ void itemize(struct file_struct *file, i
int keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
int keep_time = !preserve_times ? 0
: S_ISDIR(file->mode) ? !omit_dir_times
: !S_ISLNK(file->mode);
@@
-132,7
+132,7
@@
gets to be really large.
if (S_ISREG(file->mode) && file->length != st->st_size)
iflags |= ITEM_REPORT_SIZE;
if (S_ISREG(file->mode) && file->length != st->st_size)
iflags |= ITEM_REPORT_SIZE;
-@@ -3
51,10 +356
,10 @@ void itemize(struct file_struct *file, i
+@@ -3
48,10 +353
,10 @@ void itemize(struct file_struct *file, i
iflags |= ITEM_REPORT_TIME;
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
iflags |= ITEM_REPORT_TIME;
if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
@@
-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
-@@ -48,6 +48,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
80,16 +481
,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
3,6 +493
,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
17,8 +522
,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;
@@
-259,7
+259,7
@@
gets to be really large.
};
--- old/uidlist.c
+++ new/uidlist.c
};
--- old/uidlist.c
+++ new/uidlist.c
-@@ -3
7,6 +37
,8 @@ extern int preserve_gid;
+@@ -3
8,6 +38
,8 @@ extern int preserve_gid;
extern int numeric_ids;
extern int am_root;
extern int numeric_ids;
extern int am_root;
@@
-268,7
+268,7
@@
gets to be really large.
struct idlist {
struct idlist *next;
int id, id2;
struct idlist {
struct idlist *next;
int id, id2;
-@@ -4
6,6 +48
,8 @@ struct idlist {
+@@ -4
7,6 +49
,8 @@ struct idlist {
static struct idlist *uidlist;
static struct idlist *gidlist;
static struct idlist *uidlist;
static struct idlist *gidlist;
@@
-277,7
+277,7
@@
gets to be really large.
static struct idlist *add_to_list(struct idlist **root, int id, char *name,
int id2)
{
static struct idlist *add_to_list(struct idlist **root, int id, char *name,
int id2)
{
-@@ -30
7,7 +311
,7 @@ void send_uid_list(int f)
+@@ -30
8,7 +312
,7 @@ void send_uid_list(int f)
/* recv a complete uid/gid mapping from the peer and map the uid/gid
* in the file list to local names */
/* recv a complete uid/gid mapping from the peer and map the uid/gid
* in the file list to local names */
@@
-286,7
+286,7
@@
gets to be really large.
{
int id, i;
char *name;
{
int id, i;
char *name;
-@@ -33
8,11 +342
,40 @@ void recv_uid_list(int f, struct file_li
+@@ -33
9,11 +343
,40 @@ void recv_uid_list(int f, struct file_li
/* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {
/* Now convert all the uids/gids from sender values to our values. */
if (am_root && preserve_uid && !numeric_ids) {