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 2004-11-27 18:27:35
+--- 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," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
+ rprintf(F," --delete-suffix=SUFFIX deleted files suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update update only (don't overwrite newer files)\n");
- rprintf(F," --inplace update destination files inplace (SEE MAN PAGE)\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");
-@@ -329,6 +337,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 },
-@@ -396,6 +405,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 },
-@@ -866,6 +876,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);
}
-@@ -892,6 +904,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);
-@@ -912,6 +930,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;
-@@ -931,6 +959,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 (am_sender) {
if (delete_excluded)
args[ac++] = "--delete-excluded";
---- orig/receiver.c 2004-11-27 17:57:31
+--- orig/receiver.c 2005-01-21 00:35:26
+++ receiver.c 2004-11-03 23:10:06
-@@ -43,8 +43,11 @@ extern char *basis_dir[];
+@@ -44,8 +44,11 @@ extern int basis_dir_cnt;
extern int make_backups;
extern int do_progress;
extern char *backup_dir;
extern int cleanup_got_literal;
extern int module_id;
extern int ignore_errors;
-@@ -78,11 +81,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 */
}
-@@ -124,11 +130,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 {
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff