From e0e47893064c8fd38b96bec679416b3e562df485 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 21 Jan 2006 08:14:05 +0000 Subject: [PATCH] Fixed failing hunks. --- acls.diff | 40 ++++++++++++++--------------- backup-dir-dels.diff | 46 +++++++++++++++++----------------- date-only.diff | 32 +++++++++++------------ link-by-hash.diff | 38 ++++++++++++++-------------- source-filter_dest-filter.diff | 32 +++++++++++------------ 5 files changed, 94 insertions(+), 94 deletions(-) diff --git a/acls.diff b/acls.diff index f133f26..5d78733 100644 --- a/acls.diff +++ b/acls.diff @@ -1165,7 +1165,7 @@ ACLs to a non-ACL-supporting disk should complain. +} + +#endif /* SUPPORT_ACLS */ ---- orig/backup.c 2006-01-14 08:14:29 +--- orig/backup.c 2006-01-20 21:12:21 +++ backup.c 2004-10-06 00:13:09 @@ -134,6 +134,7 @@ static int make_bak_dir(char *fullpath) } else { @@ -1284,21 +1284,21 @@ ACLs to a non-ACL-supporting disk should complain. AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig]) AC_OUTPUT ---- orig/flist.c 2006-01-17 02:15:59 -+++ flist.c 2005-07-29 02:49:06 -@@ -958,6 +958,8 @@ static struct file_struct *send_file_nam - file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS); +--- orig/flist.c 2006-01-21 08:00:25 ++++ flist.c 2006-01-21 08:04:42 +@@ -965,6 +965,8 @@ static struct file_struct *send_file_nam + f == -2 ? SERVER_FILTERS : ALL_FILTERS); if (!file) return NULL; + if (MAKE_ACL(file, fname) < 0) + return NULL; - maybe_emit_filelist_progress(flist->count + flist_count_offset); - -@@ -966,6 +968,10 @@ static struct file_struct *send_file_nam + if (chmod_modes && (S_ISREG(file->mode) || S_ISDIR(file->mode))) + file->mode = tweak_mode(file->mode, chmod_modes); +@@ -976,6 +978,10 @@ static struct file_struct *send_file_nam if (file->basename[0]) { flist->files[flist->count++] = file; - send_file_entry(file, f, base_flags); + send_file_entry(file, f); + SEND_ACL(file, f); + } else { + /* Cleanup unsent ACL(s). */ @@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain. } return file; } -@@ -1320,6 +1326,8 @@ struct file_list *recv_file_list(int f) +@@ -1366,6 +1372,8 @@ struct file_list *recv_file_list(int f) flags |= read_byte(f) << 8; file = receive_file_entry(flist, flags, f); @@ -1315,7 +1315,7 @@ ACLs to a non-ACL-supporting disk should complain. if (S_ISREG(file->mode)) stats.total_size += file->length; -@@ -1342,6 +1350,8 @@ struct file_list *recv_file_list(int f) +@@ -1388,6 +1396,8 @@ struct file_list *recv_file_list(int f) clean_flist(flist, relative_paths, 1); @@ -1324,7 +1324,7 @@ ACLs to a non-ACL-supporting disk should complain. if (f >= 0) { /* Now send the uid/gid list. This was introduced in * protocol version 15 */ ---- orig/generator.c 2006-01-14 20:27:09 +--- orig/generator.c 2006-01-20 21:12:17 +++ generator.c 2006-01-14 08:17:25 @@ -890,6 +890,10 @@ static void recv_generator(char *fname, if (set_perms(fname, file, statret ? NULL : &st, 0) @@ -4624,7 +4624,7 @@ ACLs to a non-ACL-supporting disk should complain. next; } ---- orig/options.c 2006-01-14 08:14:30 +--- orig/options.c 2006-01-21 07:55:00 +++ options.c 2005-08-27 21:15:29 @@ -44,6 +44,7 @@ int keep_dirlinks = 0; int copy_links = 0; @@ -4653,8 +4653,8 @@ ACLs to a non-ACL-supporting disk should complain. #ifdef SUPPORT_LINKS links = ""; #endif -@@ -218,9 +224,9 @@ static void print_rsync_version(enum log - "Copyright (C) 1996-2005 by Andrew Tridgell and others\n"); +@@ -217,9 +223,9 @@ static void print_rsync_version(enum log + rprintf(f, "Copyright (C) 1996-2006 by Wayne Davison, Andrew Tridgell, and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles, \n", @@ -4665,7 +4665,7 @@ ACLs to a non-ACL-supporting disk should complain. /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature -@@ -290,6 +296,7 @@ void usage(enum logcode F) +@@ -287,6 +293,7 @@ void usage(enum logcode F) rprintf(F," -H, --hard-links preserve hard links\n"); rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n"); rprintf(F," -p, --perms preserve permissions\n"); @@ -4673,7 +4673,7 @@ ACLs to a non-ACL-supporting disk should complain. 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"); -@@ -399,6 +406,9 @@ static struct poptOption long_options[] +@@ -396,6 +403,9 @@ static struct poptOption long_options[] {"perms", 'p', POPT_ARG_VAL, &preserve_perms, 1, 0, 0 }, {"no-perms", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, {"no-p", 0, POPT_ARG_VAL, &preserve_perms, 0, 0, 0 }, @@ -4683,7 +4683,7 @@ ACLs to a non-ACL-supporting disk should complain. {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, -@@ -1000,6 +1010,24 @@ int parse_arguments(int *argc, const cha +@@ -1005,6 +1015,24 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -4708,7 +4708,7 @@ ACLs to a non-ACL-supporting disk should complain. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1434,6 +1462,8 @@ void server_options(char **args,int *arg +@@ -1441,6 +1469,8 @@ void server_options(char **args,int *arg if (preserve_hard_links) argstr[x++] = 'H'; @@ -4781,7 +4781,7 @@ ACLs to a non-ACL-supporting disk should complain. #include "proto.h" /* We have replacement versions of these if they're missing. */ ---- orig/rsync.yo 2006-01-14 08:14:31 +--- orig/rsync.yo 2006-01-21 08:12:23 +++ rsync.yo 2004-07-03 20:11:58 @@ -316,6 +316,7 @@ to the detailed description below for a -H, --hard-links preserve hard links diff --git a/backup-dir-dels.diff b/backup-dir-dels.diff index 5592699..995ee55 100644 --- a/backup-dir-dels.diff +++ b/backup-dir-dels.diff @@ -13,7 +13,7 @@ suffix. Marc St-Onge ---- orig/backup.c 2005-11-10 16:58:36 +--- orig/backup.c 2006-01-20 21:12:21 +++ backup.c 2005-02-22 02:11:15 @@ -22,11 +22,17 @@ @@ -72,7 +72,7 @@ Marc St-Onge if (!fnamebak) return 0; -@@ -97,7 +122,8 @@ path +@@ -96,7 +121,8 @@ path static int make_bak_dir(char *fullpath) { STRUCT_STAT st; @@ -82,8 +82,8 @@ Marc St-Onge char *end = rel + strlen(rel); char *p = end; -@@ -184,7 +210,8 @@ static int keep_backup(char *fname) - if (!(file = make_file(fname, NULL, NO_FILTERS))) +@@ -183,7 +209,8 @@ static int keep_backup(char *fname) + if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS))) return 1; /* the file could have disappeared */ - if (!(buf = get_backup_name(fname))) @@ -92,7 +92,7 @@ Marc St-Onge return 0; /* Check to see if this is a device file, or link */ -@@ -278,3 +305,13 @@ int make_backup(char *fname) +@@ -277,3 +304,13 @@ int make_backup(char *fname) return keep_backup(fname); return make_simple_backup(fname); } @@ -106,7 +106,7 @@ Marc St-Onge + deleting = 0; + return ret; +} ---- orig/generator.c 2005-11-12 20:31:04 +--- orig/generator.c 2006-01-20 21:12:17 +++ generator.c 2005-11-15 07:02:12 @@ -89,6 +89,9 @@ extern dev_t filesystem_dev; extern char *backup_dir; @@ -118,7 +118,7 @@ Marc St-Onge extern struct file_list *the_file_list; extern struct filter_list_struct server_filter_list; -@@ -99,10 +102,14 @@ static int deletion_count = 0; /* used t +@@ -101,10 +104,14 @@ static int can_link_devices = 1; #define DEL_TERSE (1<<3) @@ -134,7 +134,7 @@ Marc St-Onge } -@@ -123,8 +130,8 @@ static int delete_item(char *fname, int +@@ -125,8 +132,8 @@ static int delete_item(char *fname, int if (!S_ISDIR(mode)) { if (max_delete && ++deletion_count > max_delete) return 0; @@ -145,7 +145,7 @@ Marc St-Onge else ok = robust_unlink(fname) == 0; if (ok) { -@@ -146,9 +153,9 @@ static int delete_item(char *fname, int +@@ -148,9 +155,9 @@ static int delete_item(char *fname, int || (dry_run && zap_dir)) { ok = 0; errno = ENOTEMPTY; @@ -157,8 +157,8 @@ Marc St-Onge else ok = do_rmdir(fname) == 0; if (ok) { ---- orig/options.c 2005-11-15 18:21:22 -+++ options.c 2005-11-07 04:35:54 +--- orig/options.c 2006-01-21 07:55:00 ++++ options.c 2006-01-21 08:05:44 @@ -132,10 +132,14 @@ int no_detach int write_batch = 0; int read_batch = 0; @@ -174,17 +174,17 @@ Marc St-Onge char *tmpdir = NULL; char *partial_dir = NULL; char *basis_dir[MAX_BASIS_DIRS+1]; -@@ -146,7 +150,9 @@ char *password_file = NULL; +@@ -145,7 +149,9 @@ char *log_format = NULL; + char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; - char *chmod_mode = NULL; +char *backup_dir_dels = NULL; char backup_dir_buf[MAXPATHLEN]; +char backup_dir_dels_buf[MAXPATHLEN]; int rsync_port = 0; int compare_dest = 0; int copy_dest = 0; -@@ -279,6 +285,8 @@ void usage(enum logcode F) +@@ -276,6 +282,8 @@ void usage(enum logcode F) rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n"); rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n"); rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX); @@ -193,7 +193,7 @@ Marc St-Onge rprintf(F," -u, --update skip files that are newer on the receiver\n"); rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n"); rprintf(F," --append append data onto shorter files\n"); -@@ -478,7 +486,9 @@ static struct poptOption long_options[] +@@ -475,7 +483,9 @@ static struct poptOption long_options[] {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 }, {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 }, {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 }, @@ -203,7 +203,7 @@ Marc St-Onge {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 }, {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 }, {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 }, -@@ -1142,6 +1152,8 @@ int parse_arguments(int *argc, const cha +@@ -1147,6 +1157,8 @@ int parse_arguments(int *argc, const cha partial_dir = sanitize_path(NULL, partial_dir, NULL, 0); if (backup_dir) backup_dir = sanitize_path(NULL, backup_dir, NULL, 0); @@ -212,7 +212,7 @@ Marc St-Onge } if (server_filter_list.head && !am_sender) { struct filter_list_struct *elp = &server_filter_list; -@@ -1176,6 +1188,14 @@ int parse_arguments(int *argc, const cha +@@ -1181,6 +1193,14 @@ int parse_arguments(int *argc, const cha return 0; } } @@ -227,7 +227,7 @@ Marc St-Onge } if (!backup_suffix) -@@ -1187,6 +1207,16 @@ int parse_arguments(int *argc, const cha +@@ -1192,6 +1212,16 @@ int parse_arguments(int *argc, const cha backup_suffix); return 0; } @@ -244,9 +244,9 @@ Marc St-Onge if (backup_dir) { backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf); backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len; -@@ -1208,6 +1238,31 @@ int parse_arguments(int *argc, const cha - "--suffix cannot be a null string without --backup-dir\n"); - return 0; +@@ -1215,6 +1245,31 @@ int parse_arguments(int *argc, const cha + "P *%s", backup_suffix); + parse_rule(&filter_list, backup_dir_buf, 0, 0); } + /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */ + if (backup_dir && !backup_dir_dels) { @@ -276,7 +276,7 @@ Marc St-Onge if (make_backups && !backup_dir) omit_dir_times = 1; -@@ -1530,6 +1585,10 @@ void server_options(char **args,int *arg +@@ -1544,6 +1599,10 @@ void server_options(char **args,int *arg args[ac++] = "--backup-dir"; args[ac++] = backup_dir; } @@ -287,7 +287,7 @@ Marc St-Onge /* Only send --suffix if it specifies a non-default value. */ if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) { -@@ -1538,7 +1597,13 @@ void server_options(char **args,int *arg +@@ -1552,7 +1611,13 @@ void server_options(char **args,int *arg goto oom; args[ac++] = arg; } diff --git a/date-only.diff b/date-only.diff index 032b754..b9f87bb 100644 --- a/date-only.diff +++ b/date-only.diff @@ -15,28 +15,28 @@ Jeremy Bornstein [Patched update to have context and apply to latest CVS source.] ---- orig/generator.c 2005-08-17 06:45:07 +--- orig/generator.c 2006-01-20 21:12:17 +++ generator.c 2004-11-11 22:15:27 -@@ -58,6 +58,7 @@ extern int append_mode; +@@ -59,6 +59,7 @@ extern int append_mode; extern int make_backups; extern int csum_length; extern int ignore_times; +extern int date_only; extern int size_only; extern OFF_T max_size; - extern int io_error; -@@ -360,6 +361,8 @@ void itemize(struct file_struct *file, i + extern OFF_T min_size; +@@ -378,6 +379,8 @@ void itemize(struct file_struct *file, i /* Perform our quick-check heuristic for determining if a file is unchanged. */ - static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) + int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { + if (date_only) + return cmp_modtime(st->st_mtime, file->modtime) == 0; if (st->st_size != file->length) return 0; ---- orig/options.c 2005-08-27 21:11:26 -+++ options.c 2005-08-27 21:19:31 -@@ -90,6 +90,7 @@ int keep_partial = 0; +--- orig/options.c 2006-01-21 07:55:00 ++++ options.c 2006-01-21 08:07:05 +@@ -93,6 +93,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; int size_only = 0; @@ -44,7 +44,7 @@ Jeremy Bornstein int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -316,6 +317,7 @@ void usage(enum logcode F) +@@ -321,6 +322,7 @@ void usage(enum logcode F) rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); rprintf(F," --size-only skip files that match in size\n"); @@ -52,15 +52,15 @@ Jeremy Bornstein rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); -@@ -413,6 +415,7 @@ static struct poptOption long_options[] - {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, +@@ -425,6 +427,7 @@ static struct poptOption long_options[] + {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, + {"date-only", 0, POPT_ARG_NONE, &date_only, 0, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, - {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, -@@ -1445,6 +1448,9 @@ void server_options(char **args,int *arg + {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, +@@ -1573,6 +1576,9 @@ void server_options(char **args,int *arg if (size_only) args[ac++] = "--size-only"; @@ -70,7 +70,7 @@ Jeremy Bornstein if (modify_window_set) { if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) goto oom; ---- orig/rsync.yo 2005-08-27 21:05:12 +--- orig/rsync.yo 2006-01-21 08:12:23 +++ rsync.yo 2005-02-11 22:49:10 @@ -350,6 +350,7 @@ to the detailed description below for a --timeout=TIME set I/O timeout in seconds @@ -80,7 +80,7 @@ Jeremy Bornstein --modify-window=NUM compare mod-times with reduced accuracy -T, --temp-dir=DIR create temporary files in directory DIR -y, --fuzzy find similar file for basis if no dest file -@@ -448,6 +449,12 @@ regardless of timestamp. This is useful +@@ -453,6 +454,12 @@ regardless of timestamp. This is useful after using another mirroring system which may not preserve timestamps exactly. diff --git a/link-by-hash.diff b/link-by-hash.diff index d8d7c06..7ba160f 100644 --- a/link-by-hash.diff +++ b/link-by-hash.diff @@ -365,17 +365,17 @@ the file's name. +} + +#endif ---- orig/options.c 2006-01-14 08:14:30 -+++ options.c 2005-11-07 04:37:30 -@@ -146,6 +146,7 @@ char *password_file = NULL; - char *rsync_path = RSYNC_PATH; - char *backup_dir = NULL; - char *chmod_mode = NULL; +--- orig/options.c 2006-01-21 07:55:00 ++++ options.c 2006-01-21 08:08:53 +@@ -139,6 +139,7 @@ char *backup_suffix = NULL; + char *tmpdir = NULL; + char *partial_dir = NULL; + char *basis_dir[MAX_BASIS_DIRS+1]; +char *link_by_hash_dir = NULL; - char backup_dir_buf[MAXPATHLEN]; - int rsync_port = 0; - int compare_dest = 0; -@@ -330,6 +331,7 @@ void usage(enum logcode F) + char *config_file = NULL; + char *shell_cmd = NULL; + char *log_format = NULL; +@@ -327,6 +328,7 @@ void usage(enum logcode F) rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n"); rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n"); @@ -383,7 +383,7 @@ the file's name. rprintf(F," -z, --compress compress file data during the transfer\n"); rprintf(F," --compress-level=NUM explicitly set compression level\n"); rprintf(F," -C, --cvs-exclude auto-ignore files the same way CVS does\n"); -@@ -375,7 +377,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP +@@ -372,7 +374,7 @@ enum {OPT_VERSION = 1000, OPT_DAEMON, OP OPT_FILTER, OPT_COMPARE_DEST, OPT_COPY_DEST, OPT_LINK_DEST, OPT_HELP, OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW, OPT_MIN_SIZE, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE, @@ -392,7 +392,7 @@ the file's name. static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ -@@ -463,6 +465,7 @@ static struct poptOption long_options[] +@@ -460,6 +462,7 @@ static struct poptOption long_options[] {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 }, {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, @@ -400,7 +400,7 @@ the file's name. {"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 }, {"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 }, {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 }, -@@ -1000,6 +1003,21 @@ int parse_arguments(int *argc, const cha +@@ -1005,6 +1008,21 @@ int parse_arguments(int *argc, const cha basis_dir[basis_dir_cnt++] = (char *)arg; break; @@ -422,8 +422,8 @@ the file's name. default: /* A large opt value means that set_refuse_options() * turned this option off. */ -@@ -1629,6 +1647,11 @@ void server_options(char **args,int *arg - args[ac++] = chmod_mode; +@@ -1636,6 +1654,11 @@ void server_options(char **args,int *arg + } } + if (link_by_hash_dir && am_sender) { @@ -434,7 +434,7 @@ the file's name. if (files_from && (!am_sender || filesfrom_host)) { if (filesfrom_host) { args[ac++] = "--files-from"; ---- orig/receiver.c 2006-01-14 08:14:31 +--- orig/receiver.c 2006-01-14 20:27:09 +++ receiver.c 2005-01-15 21:29:13 @@ -54,6 +54,7 @@ extern int delay_updates; extern struct stats stats; @@ -543,9 +543,9 @@ the file's name. if (ret < 0) { rsyserr(FERROR, errno, "%s %s -> \"%s\"", ret == -2 ? "copy" : "rename", ---- orig/rsync.h 2006-01-14 08:14:31 +--- orig/rsync.h 2006-01-14 20:27:10 +++ rsync.h 2004-07-03 20:20:15 -@@ -639,6 +639,14 @@ struct stats { +@@ -640,6 +640,14 @@ struct stats { int current_file_index; }; @@ -560,7 +560,7 @@ the file's name. #include "byteorder.h" #include "lib/mdfour.h" ---- orig/rsync.yo 2006-01-14 08:14:31 +--- orig/rsync.yo 2006-01-21 08:12:23 +++ rsync.yo 2005-02-13 06:58:47 @@ -356,6 +356,7 @@ to the detailed description below for a --compare-dest=DIR also compare received files relative to DIR diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index cec9390..c5e9f47 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -25,7 +25,7 @@ Implementation details for the --source-filter and -dest-filter options: You should run "make proto" before running "make". ---- orig/generator.c 2006-01-14 08:14:30 +--- orig/generator.c 2006-01-20 21:12:17 +++ generator.c 2005-08-17 07:28:01 @@ -59,6 +59,7 @@ extern int append_mode; extern int make_backups; @@ -44,8 +44,8 @@ You should run "make proto" before running "make". return 0; /* if always checksum is set then we use the checksum instead ---- orig/options.c 2006-01-14 08:14:30 -+++ options.c 2005-08-27 21:27:17 +--- orig/options.c 2006-01-21 07:55:00 ++++ options.c 2006-01-21 08:09:48 @@ -93,6 +93,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; @@ -63,7 +63,7 @@ You should run "make proto" before running "make". char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; -@@ -324,6 +327,7 @@ void usage(enum logcode F) +@@ -321,6 +324,7 @@ void usage(enum logcode F) rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); rprintf(F," --size-only skip files that match in size\n"); @@ -71,7 +71,7 @@ You should run "make proto" before running "make". rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); -@@ -358,6 +362,8 @@ void usage(enum logcode F) +@@ -355,6 +359,8 @@ void usage(enum logcode F) rprintf(F," --write-batch=FILE write a batched update to FILE\n"); rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n"); rprintf(F," --read-batch=FILE read a batched update from FILE\n"); @@ -80,15 +80,15 @@ You should run "make proto" before running "make". rprintf(F," --protocol=NUM force an older protocol version to be used\n"); #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); -@@ -428,6 +434,7 @@ static struct poptOption long_options[] +@@ -425,6 +431,7 @@ static struct poptOption long_options[] {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 }, {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, + {"times-only", 0, POPT_ARG_NONE, ×_only , 0, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, {"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 }, -@@ -499,6 +506,8 @@ static struct poptOption long_options[] +@@ -496,6 +503,8 @@ static struct poptOption long_options[] {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 }, {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 }, @@ -97,7 +97,7 @@ You should run "make proto" before running "make". {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, {"server", 0, POPT_ARG_NONE, &am_server, 0, 0, 0 }, -@@ -1324,6 +1333,16 @@ int parse_arguments(int *argc, const cha +@@ -1331,6 +1340,16 @@ int parse_arguments(int *argc, const cha } } @@ -114,7 +114,7 @@ You should run "make proto" before running "make". if (files_from) { char *h, *p; int q; -@@ -1558,6 +1577,25 @@ void server_options(char **args,int *arg +@@ -1570,6 +1589,25 @@ void server_options(char **args,int *arg args[ac++] = "--only-write-batch=X"; } @@ -140,7 +140,7 @@ You should run "make proto" before running "make". if (size_only) args[ac++] = "--size-only"; ---- orig/pipe.c 2006-01-14 08:14:31 +--- orig/pipe.c 2006-01-21 08:03:40 +++ pipe.c 2006-01-14 08:34:59 @@ -157,3 +157,77 @@ pid_t local_child(int argc, char **argv, @@ -220,7 +220,7 @@ You should run "make proto" before running "make". + + return pid; +} ---- orig/receiver.c 2006-01-14 08:14:31 +--- orig/receiver.c 2006-01-14 20:27:09 +++ receiver.c 2005-08-17 07:57:33 @@ -53,6 +53,7 @@ extern int inplace; extern int delay_updates; @@ -290,7 +290,7 @@ You should run "make proto" before running "make". if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { finish_transfer(fname, fnametmp, file, recv_ok, 1); if (partialptr != fname && fnamecmp == partialptr) { ---- orig/rsync.h 2006-01-14 08:14:31 +--- orig/rsync.h 2006-01-14 20:27:10 +++ rsync.h 2005-08-17 07:10:11 @@ -103,6 +103,7 @@ #define IOERR_DEL_LIMIT (1<<2) @@ -300,7 +300,7 @@ You should run "make proto" before running "make". #define MAX_BASIS_DIRS 20 #define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100) ---- orig/rsync.yo 2006-01-14 08:14:31 +--- orig/rsync.yo 2006-01-21 08:12:23 +++ rsync.yo 2005-08-17 07:08:21 @@ -350,6 +350,7 @@ to the detailed description below for a --timeout=TIME set I/O timeout in seconds @@ -319,7 +319,7 @@ You should run "make proto" before running "make". --protocol=NUM force an older protocol version to be used --checksum-seed=NUM set block/file checksum seed (advanced) -4, --ipv4 prefer IPv4 -@@ -1411,6 +1414,33 @@ file previously generated by bf(--write- +@@ -1430,6 +1433,33 @@ file previously generated by bf(--write- If em(FILE) is bf(-), the batch data will be read from standard input. See the "BATCH MODE" section for details. @@ -353,7 +353,7 @@ You should run "make proto" before running "make". dit(bf(--protocol=NUM)) Force an older protocol version to be used. This is useful for creating a batch file that is compatible with an older version of rsync. For instance, if rsync 2.6.4 is being used with the ---- orig/sender.c 2006-01-14 08:14:31 +--- orig/sender.c 2006-01-14 20:27:10 +++ sender.c 2005-08-17 07:40:49 @@ -41,6 +41,7 @@ extern int write_batch; extern struct stats stats; -- 2.34.1