Fixed failing hunks.

diff --git a/atimes.diff b/atimes.diff
index 3e369ce91fe0a8f5001d3a757a1200802de003e5..9bf36bd9442f4906c17b101c63037b5a5f044f27 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -65,7 +65,7 @@ After applying this patch, run these commands for a successful build:
                write_byte(f, 0);
 -              modtime = 0, mode = 0;
 +              modtime = 0, atime = 0, mode = 0;
-               dev = 0, rdev = makedev(0, 0);
+               dev = 0, rdev = MAKEDEV(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
 @@ -323,7 +333,7 @@ static void send_file_entry(struct file_
@@ -113,7 +113,7 @@ After applying this patch, run these commands for a successful build:
        if (!flist) {
 -              modtime = 0, mode = 0;
 +              modtime = 0, atime = 0, mode = 0;
-               dev = 0, rdev = makedev(0, 0);
+               dev = 0, rdev = MAKEDEV(0, 0);
                rdev_major = 0;
                uid = 0, gid = 0;
 @@ -552,6 +571,8 @@ static struct file_struct *receive_file_
@@ -485,7 +485,7 @@ After applying this patch, run these commands for a successful build:
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -523,9 +525,12 @@ struct file_struct {
+@@ -529,9 +531,12 @@ struct file_struct {
        uid_t uid;
        gid_t gid;
        mode_t mode;

diff --git a/id-pair.diff b/id-pair.diff
index 30bd52c2e20958f5da3696180698977f62d760ab..200ffe6a9d03b30e8bdec1b888a2ae7385f598ef 100644 (file)
--- a/id-pair.diff
+++ b/id-pair.diff
@@ -21,7 +21,7 @@ gets to be really large.
 @@ -347,14 +348,14 @@ static void send_file_entry(struct file_
                }
        } else if (protocol_version < 28)
-               rdev = makedev(0, 0);
+               rdev = MAKEDEV(0, 0);
 -      if (file->uid == uid)
 +      if (id_pairs[file->id_ndx].uid == uid)
                flags |= XMIT_SAME_UID;
@@ -47,7 +47,7 @@ gets to be really large.
  
        if (dirname_len) {
                file->dirname = lastdir = bp;
-@@ -855,8 +855,7 @@ struct file_struct *make_file(char *fnam
+@@ -857,8 +857,7 @@ struct file_struct *make_file(char *fnam
        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) {
-@@ -924,8 +923,7 @@ struct file_struct *make_file(char *fnam
+@@ -926,8 +925,7 @@ struct file_struct *make_file(char *fnam
                        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;
-@@ -1375,7 +1373,7 @@ struct file_list *recv_file_list(int f)
+@@ -1377,7 +1375,7 @@ struct file_list *recv_file_list(int f)
        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)
-@@ -1691,13 +1689,15 @@ static void output_flist(struct file_lis
+@@ -1693,13 +1691,15 @@ static void output_flist(struct file_lis
  
        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
-@@ -90,6 +90,7 @@ extern dev_t filesystem_dev;
+@@ -89,6 +89,7 @@ extern dev_t filesystem_dev;
  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;
  
-@@ -323,10 +324,12 @@ int unchanged_attrs(struct file_struct *
+@@ -322,10 +323,12 @@ int unchanged_attrs(struct file_struct *
         && (st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
                return 0;
  
@@ -123,7 +123,7 @@ gets to be really large.
                return 0;
  
        return 1;
-@@ -339,6 +342,8 @@ void itemize(struct file_struct *file, i
+@@ -338,6 +341,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);
@@ -132,7 +132,7 @@ gets to be really large.
  
                if (S_ISREG(file->mode) && file->length != st->st_size)
                        iflags |= ITEM_REPORT_SIZE;
-@@ -348,10 +353,10 @@ void itemize(struct file_struct *file, i
+@@ -347,10 +352,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;
@@ -148,15 +148,15 @@ gets to be really large.
                iflags |= ITEM_IS_NEW;
 --- old/log.c
 +++ new/log.c
-@@ -45,6 +45,7 @@ extern char *auth_user;
- extern char *log_format;
+@@ -46,6 +46,7 @@ extern char *auth_user;
+ extern char *stdout_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
-@@ -464,16 +465,16 @@ static void log_formatted(enum logcode c
+@@ -471,16 +472,16 @@ static void log_formatted(enum logcode c
                case 'U':
                        strlcat(fmt, "ld", sizeof fmt);
                        snprintf(buf2, sizeof buf2, fmt,
@@ -178,7 +178,7 @@ gets to be really large.
                        break;
 --- old/rsync.c
 +++ new/rsync.c
-@@ -50,6 +50,7 @@ extern int keep_dirlinks;
+@@ -49,6 +49,7 @@ extern int keep_dirlinks;
  extern int make_backups;
  extern mode_t orig_umask;
  extern struct stats stats;
@@ -186,7 +186,7 @@ gets to be really large.
  extern struct chmod_mode_struct *daemon_chmod_modes;
  
  #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
-@@ -128,6 +129,8 @@ int set_file_attrs(char *fname, struct f
+@@ -127,6 +128,8 @@ int set_file_attrs(char *fname, struct f
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
@@ -195,7 +195,7 @@ gets to be really large.
  
        if (!st) {
                if (dry_run)
-@@ -160,9 +163,11 @@ int set_file_attrs(char *fname, struct f
+@@ -159,9 +162,11 @@ int set_file_attrs(char *fname, struct f
                        updated = 1;
        }
  
@@ -210,7 +210,7 @@ gets to be really large.
  #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
        if (S_ISLNK(st->st_mode))
                ;
-@@ -174,18 +179,18 @@ int set_file_attrs(char *fname, struct f
+@@ -173,18 +178,18 @@ int set_file_attrs(char *fname, struct f
                                rprintf(FINFO,
                                        "set uid of %s from %ld to %ld\n",
                                        fname,
@@ -235,7 +235,7 @@ gets to be really large.
                        rsyserr(FERROR, errno, "%s %s failed",
 --- old/rsync.h
 +++ new/rsync.h
-@@ -496,6 +496,11 @@ struct hlink {
+@@ -502,6 +502,11 @@ struct hlink {
        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
  
-@@ -520,8 +525,7 @@ struct file_struct {
+@@ -526,8 +531,7 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;