From 9d95bd65999f88d647d0e699bd714b780433e4c0 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 24 Sep 2005 19:08:11 +0000 Subject: [PATCH] Fixed a failing hunk. --- atimes.diff | 58 ++++++++++++++++++++++++++--------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/atimes.diff b/atimes.diff index caa01c1..f27e238 100644 --- a/atimes.diff +++ b/atimes.diff @@ -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); ---- orig/flist.c 2005-08-17 06:45:07 +--- orig/flist.c 2005-09-17 21:48:45 +++ flist.c 2005-07-28 00:16:34 @@ -50,6 +50,7 @@ extern int preserve_perms; extern int preserve_devices; @@ -85,7 +85,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (!numeric_ids) add_uid(uid); -@@ -506,6 +518,7 @@ static struct file_struct *receive_file_ +@@ -503,6 +515,7 @@ static struct file_struct *receive_file_ 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; -@@ -524,7 +537,7 @@ static struct file_struct *receive_file_ +@@ -521,7 +534,7 @@ static struct file_struct *receive_file_ 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; -@@ -580,6 +593,8 @@ static struct file_struct *receive_file_ +@@ -577,6 +590,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)); @@ -111,7 +111,7 @@ command before "make": if (preserve_uid && !(flags & XMIT_SAME_UID)) uid = (uid_t)read_int(f); -@@ -630,6 +645,7 @@ static struct file_struct *receive_file_ +@@ -627,6 +642,7 @@ static struct file_struct *receive_file_ file->flags = 0; file->modtime = modtime; @@ -119,7 +119,7 @@ command before "make": file->length = file_length; file->mode = mode; file->uid = uid; -@@ -882,6 +898,7 @@ skip_filters: +@@ -876,6 +892,7 @@ skip_filters: file->flags = flags; file->modtime = st.st_mtime; @@ -127,7 +127,7 @@ command before "make": file->length = st.st_size; file->mode = st.st_mode; file->uid = st.st_uid; ---- orig/generator.c 2005-08-17 06:45:07 +--- orig/generator.c 2005-09-15 18:09:14 +++ generator.c 2005-07-28 00:14:43 @@ -44,6 +44,7 @@ extern int preserve_uid; extern int preserve_gid; @@ -217,7 +217,7 @@ command before "make": if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { char ch = iflags & ITEM_IS_NEW ? '+' : '?'; ---- orig/options.c 2005-08-27 21:11:26 +--- orig/options.c 2005-09-24 17:40:31 +++ options.c 2005-08-27 21:16:51 @@ -49,6 +49,7 @@ int preserve_uid = 0; int preserve_gid = 0; @@ -227,7 +227,7 @@ command before "make": int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -287,8 +288,9 @@ void usage(enum logcode F) +@@ -286,8 +287,9 @@ void usage(enum logcode F) rprintf(F," -o, --owner preserve owner (root only)\n"); rprintf(F," -g, --group preserve group\n"); rprintf(F," -D, --devices preserve devices (root only)\n"); @@ -249,7 +249,7 @@ command before "make": {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 }, {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, {"owner", 'o', POPT_ARG_VAL, &preserve_uid, 1, 0, 0 }, -@@ -1337,6 +1342,8 @@ void server_options(char **args,int *arg +@@ -1356,6 +1361,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -310,7 +310,7 @@ command before "make": } change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2005-08-17 06:45:08 +--- orig/rsync.h 2005-09-24 17:40:31 +++ rsync.h 2005-07-28 00:04:51 @@ -54,6 +54,7 @@ #define XMIT_HAS_IDEV_DATA (1<<9) @@ -336,7 +336,7 @@ command before "make": #define ITEM_REPORT_CHECKSUM (1<<1) #define ITEM_REPORT_SIZE (1<<2) #define ITEM_REPORT_TIME (1<<3) -@@ -517,6 +520,7 @@ struct file_struct { +@@ -521,6 +524,7 @@ struct file_struct { struct hlink *links; } link_u; time_t modtime; @@ -344,9 +344,9 @@ command before "make": uid_t uid; gid_t gid; mode_t mode; ---- orig/rsync.yo 2005-08-27 21:05:12 +--- orig/rsync.yo 2005-09-24 17:40:31 +++ rsync.yo 2005-07-28 01:04:09 -@@ -321,8 +321,9 @@ to the detailed description below for a +@@ -319,8 +319,9 @@ to the detailed description below for a -o, --owner preserve owner (root only) -g, --group preserve group -D, --devices preserve devices (root only) @@ -370,7 +370,7 @@ command before "make": dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers, instead it will just report the actions it would have taken. -@@ -1103,7 +1110,7 @@ changes that are being made to each file +@@ -1104,7 +1111,7 @@ changes that are being made to each file This is exactly the same as specifying bf(--log-format='%i %n%L'). The "%i" escape has a cryptic output that is 9 letters long. The general @@ -379,7 +379,7 @@ command before "make": kind of update being done, bf(X) is replaced by the file-type, and the other letters represent attributes that may be output if they are being modified. -@@ -1142,17 +1149,22 @@ quote(itemize( +@@ -1143,17 +1150,22 @@ quote(itemize( by the file transfer. it() A bf(t) means the modification time is different and is being updated to the sender's value (requires bf(--times)). An alternate value of bf(T) @@ -601,7 +601,7 @@ command before "make": ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- orig/tls.c 2005-01-19 19:30:29 +--- orig/tls.c 2005-09-24 17:40:31 +++ tls.c 2005-03-23 17:49:48 @@ -39,6 +39,7 @@ @@ -629,12 +629,12 @@ command before "make": + struct tm *mt = gmtime(&t); + sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ", -+ mt->tm_year + 1900, -+ mt->tm_mon + 1, -+ mt->tm_mday, -+ mt->tm_hour, -+ mt->tm_min, -+ mt->tm_sec); ++ (int)mt->tm_year + 1900, ++ (int)mt->tm_mon + 1, ++ (int)mt->tm_mday, ++ (int)mt->tm_hour, ++ (int)mt->tm_min, ++ (int)mt->tm_sec); + } else { + strcpy(dest, " "); + } @@ -659,12 +659,12 @@ command before "make": - mt = gmtime(&buf.st_mtime); - - sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d", -- mt->tm_year + 1900, -- mt->tm_mon + 1, -- mt->tm_mday, -- mt->tm_hour, -- mt->tm_min, -- mt->tm_sec); +- (int)mt->tm_year + 1900, +- (int)mt->tm_mon + 1, +- (int)mt->tm_mday, +- (int)mt->tm_hour, +- (int)mt->tm_min, +- (int)mt->tm_sec); - } else { - strcpy(datebuf, " "); - } -- 2.34.1