Marc St-Onge
---- orig/backup.c 2004-10-06 00:12:15
+--- orig/backup.c 2005-01-19 20:11:10
+++ backup.c 2004-09-22 02:36:06
@@ -22,11 +22,17 @@
char *end = rel + strlen(rel);
char *p = end;
-@@ -173,7 +199,8 @@ static int keep_backup(char *fname)
+@@ -168,7 +194,8 @@ static int keep_backup(char *fname)
if (!(file = make_file(fname, NULL, NO_EXCLUDES)))
return 1; /* the file could have disappeared */
return 0;
/* Check to see if this is a device file, or link */
-@@ -264,3 +291,13 @@ int make_backup(char *fname)
+@@ -259,3 +286,13 @@ int make_backup(char *fname)
return keep_backup(fname);
return make_simple_backup(fname);
}
+ deleting = 0;
+ return ret;
+}
---- orig/options.c 2005-01-17 23:11:45
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2004-11-27 18:37:18
-@@ -115,10 +115,14 @@ int no_detach = 0;
+@@ -116,10 +116,14 @@ int no_detach = 0;
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
char *tmpdir = NULL;
char *partial_dir = NULL;
char *basis_dir[MAX_BASIS_DIRS+1];
-@@ -128,7 +132,9 @@ char *log_format = NULL;
+@@ -129,7 +133,9 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
int rsync_port = 0;
int compare_dest = 0;
int copy_dest = 0;
-@@ -246,7 +252,9 @@ void usage(enum logcode F)
+@@ -247,7 +253,9 @@ void usage(enum logcode F)
rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
rprintf(F," --backup-dir make backups into this directory\n");
rprintf(F," -u, --update update only (don't overwrite newer files)\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," -K, --keep-dirlinks treat symlinked dir on receiver as dir\n");
-@@ -330,6 +338,7 @@ static struct poptOption long_options[]
+@@ -331,6 +339,7 @@ static struct poptOption long_options[]
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
{"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0},
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
{"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
{"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
-@@ -398,6 +407,7 @@ static struct poptOption long_options[]
+@@ -399,6 +408,7 @@ static struct poptOption long_options[]
{"log-format", 0, POPT_ARG_STRING, &log_format, 0, 0, 0 },
{"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links, 0, 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 },
-@@ -867,6 +877,8 @@ int parse_arguments(int *argc, const cha
+@@ -871,6 +881,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);
if (files_from)
files_from = sanitize_path(NULL, files_from, NULL, 0);
}
-@@ -893,6 +905,12 @@ int parse_arguments(int *argc, const cha
+@@ -897,6 +909,12 @@ int parse_arguments(int *argc, const cha
if (check_exclude(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (server_exclude_list.head && files_from) {
clean_fname(files_from, 1);
-@@ -913,6 +931,16 @@ int parse_arguments(int *argc, const cha
+@@ -917,6 +935,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
return 0;
}
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;
-@@ -932,6 +960,31 @@ int parse_arguments(int *argc, const cha
+@@ -936,6 +964,31 @@ int parse_arguments(int *argc, const cha
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
if (do_progress && !verbose)
verbose = 1;
-@@ -1139,6 +1192,10 @@ void server_options(char **args,int *arg
+@@ -1144,6 +1197,10 @@ void server_options(char **args,int *arg
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -1147,7 +1204,13 @@ void server_options(char **args,int *arg
+@@ -1152,7 +1209,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}
if (am_sender) {
if (delete_excluded)
args[ac++] = "--delete-excluded";
---- orig/receiver.c 2005-01-17 23:11:45
+--- orig/receiver.c 2005-01-21 00:35:26
+++ receiver.c 2004-11-03 23:10:06
@@ -44,8 +44,11 @@ extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
extern int module_id;
extern int ignore_errors;
-@@ -79,11 +82,14 @@ static void delete_one(char *fn, int is_
- }
- }
+@@ -56,11 +59,14 @@ extern int inplace;
+
+ extern struct exclude_list_struct server_exclude_list;
-
+/* Function now checks if file matches backup or delete suffix patterns */
}
-@@ -125,11 +131,12 @@ void delete_files(struct file_list *flis
+@@ -102,11 +108,12 @@ void delete_files(struct file_list *flis
if (flist_find(flist,local_file_list->files[i]) < 0) {
char *f = f_name(local_file_list->files[i]);
int mode = local_file_list->files[i]->mode;
+ rprintf(FINFO, "safe-deleting %s\n",
safe_fname(f));
}
- } else
+ } else {
make proto
---- orig/io.c 2005-01-17 23:11:45
+--- orig/io.c 2005-01-19 20:11:10
+++ io.c 2005-01-10 10:49:17
@@ -244,6 +244,14 @@ static void read_msg_fd(void)
read_loop(fd, buf, 4);
if (argc == 0)
list_only = 1;
---- orig/options.c 2005-01-17 23:11:45
+--- orig/options.c 2005-01-20 23:05:34
+++ options.c 2005-01-10 10:46:47
-@@ -88,8 +88,10 @@ int daemon_bwlimit = 0;
+@@ -89,8 +89,10 @@ int daemon_bwlimit = 0;
int bwlimit = 0;
size_t bwlimit_writemax = 0;
int delete_after = 0;
int max_delete = 0;
OFF_T max_size = 0;
int ignore_errors = 0;
-@@ -273,6 +275,7 @@ void usage(enum logcode F)
+@@ -274,6 +276,7 @@ void usage(enum logcode F)
rprintf(F," --delete delete files that don't exist on the sending side\n");
rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
rprintf(F," --delete-after receiver deletes after transferring, not before\n");
rprintf(F," --ignore-errors delete even if there are I/O errors\n");
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
rprintf(F," --max-size=SIZE don't transfer any file larger than SIZE\n");
-@@ -341,6 +344,7 @@ static struct poptOption long_options[]
+@@ -342,6 +345,7 @@ static struct poptOption long_options[]
{"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing, 0, 0, 0 },
{"delete-after", 0, POPT_ARG_NONE, 0, OPT_DELETE_AFTER, 0, 0 },
{"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
{"force", 0, POPT_ARG_NONE, &force_delete, 0, 0, 0 },
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
-@@ -854,6 +858,9 @@ int parse_arguments(int *argc, const cha
+@@ -858,6 +862,9 @@ int parse_arguments(int *argc, const cha
if (relative_paths < 0)
relative_paths = files_from? 1 : 0;
*argv = poptGetArgs(pc);
*argc = count_args(*argv);
-@@ -1234,6 +1241,9 @@ void server_options(char **args,int *arg
- args[ac++] = "--no-relative";
- }
+@@ -1241,6 +1248,9 @@ void server_options(char **args,int *arg
+ if (!implied_dirs && !am_sender)
+ args[ac++] = "--no-implied-dirs";
+ if (delete_sent_files)
+ args[ac++] = "--delete-sent-files";
*argc = ac;
return;
---- orig/receiver.c 2005-01-17 23:11:45
+--- orig/receiver.c 2005-01-21 00:35:26
+++ receiver.c 2004-08-13 08:38:51
@@ -47,6 +47,7 @@ extern char *backup_dir;
extern char *backup_suffix;
extern int module_id;
extern int ignore_errors;
extern int orig_umask;
-@@ -343,7 +344,7 @@ int recv_files(int f_in, struct file_lis
+@@ -322,7 +323,7 @@ int recv_files(int f_in, struct file_lis
char *fname, fbuf[MAXPATHLEN];
char template[MAXPATHLEN];
char fnametmp[MAXPATHLEN];
char fnamecmpbuf[MAXPATHLEN];
struct file_struct *file;
struct stats initial_stats;
-@@ -589,7 +590,12 @@ int recv_files(int f_in, struct file_lis
+@@ -568,7 +569,12 @@ int recv_files(int f_in, struct file_lis
cleanup_disable();
int msgtype = csum_length == SUM_LENGTH || read_batch ?
FERROR : FINFO;
if (msgtype == FERROR || verbose) {
-@@ -613,9 +619,8 @@ int recv_files(int f_in, struct file_lis
+@@ -592,9 +598,8 @@ int recv_files(int f_in, struct file_lis
keptstr, redostr);
}
if (csum_length != SUM_LENGTH) {
}
}
}
---- orig/rsync.h 2005-01-17 23:11:45
+--- orig/rsync.h 2005-01-21 00:35:26
+++ rsync.h 2004-07-03 20:17:10
@@ -60,6 +60,7 @@
- #define FLAG_TOP_DIR (1<<0)
+ #define FLAG_DEL_START (1<<0)
#define FLAG_HLINK_EOL (1<<1) /* generator only */
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
+#define FLAG_SENT (1<<7) /* sender only */
/* update this if you make incompatible changes */
#define PROTOCOL_VERSION 29
-@@ -137,6 +138,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
+@@ -142,6 +143,7 @@ enum logcode { FERROR=1, FINFO=2, FLOG=3
/* Messages types that are sent over the message channel. The logcode
* values must all be present here with identical numbers. */
enum msgcode {
MSG_DONE=5, /* current phase is done */
MSG_REDO=4, /* reprocess indicated flist index */
MSG_ERROR=FERROR, MSG_INFO=FINFO, MSG_LOG=FLOG, /* remote logging */
---- orig/rsync.yo 2005-01-17 23:11:46
+--- orig/rsync.yo 2005-01-20 19:47:08
+++ rsync.yo 2004-07-03 20:17:10
@@ -343,6 +343,7 @@ verb(
--delete delete files that don't exist on sender
Matt McCutchen's Web Site / rsync / rsync-patches.git / commitdiff