1 This patches creates two new command line options as follows:
5 The backup-dir-dels and suffix-dels options give the ability to store
6 backup of removed files on the receiver in different directories or with
7 different suffix than the backup of files that have been changed but that
8 are still on the source drive. Both commands can be combined.
10 The default behaviour if one or both of the options are not specified
11 is the previous behaviour, both backups use the same directory or
16 To use this patch, run these commands for a successful build:
18 patch -p1 <patches/backup-dir-dels.diff
19 ./configure (optional if already run)
27 extern int backup_dir_len;
28 +extern int backup_dir_dels_len;
29 extern unsigned int backup_dir_remainder;
30 +extern unsigned int backup_dir_dels_remainder;
31 extern char backup_dir_buf[MAXPATHLEN];
32 +extern char backup_dir_dels_buf[MAXPATHLEN];
33 extern char *backup_suffix;
34 +extern char *backup_suffix_dels;
35 extern char *backup_dir;
36 +extern char *backup_dir_dels;
39 extern int preserve_devices;
40 @@ -34,6 +39,8 @@ extern int preserve_specials;
41 extern int preserve_links;
42 extern int safe_symlinks;
46 /* make a complete pathname for backup file */
47 char *get_backup_name(char *fname)
49 @@ -51,11 +58,28 @@ char *get_backup_name(char *fname)
53 +static char *get_delete_name(char *fname)
55 + if (backup_dir_dels) {
56 + if (stringjoin(backup_dir_dels_buf + backup_dir_dels_len, backup_dir_dels_remainder,
57 + fname, backup_suffix_dels, NULL) < backup_dir_dels_remainder)
58 + return backup_dir_dels_buf;
60 + if (stringjoin(backup_dir_dels_buf, MAXPATHLEN,
61 + fname, backup_suffix_dels, NULL) < MAXPATHLEN)
62 + return backup_dir_dels_buf;
65 + rprintf(FERROR, "delete filename too long\n");
69 /* simple backup creates a backup with a suffix in the same directory */
70 static int make_simple_backup(char *fname)
73 - char *fnamebak = get_backup_name(fname);
74 + char *fnamebak = deleting ? get_delete_name(fname)
75 + : get_backup_name(fname);
79 @@ -95,7 +119,8 @@ path
80 static int make_bak_dir(char *fullpath)
83 - char *rel = fullpath + backup_dir_len;
84 + int dir_len = deleting ? backup_dir_dels_len : backup_dir_len;
85 + char *rel = fullpath + dir_len;
86 char *end = rel + strlen(rel);
89 @@ -183,7 +208,8 @@ static int keep_backup(char *fname)
90 if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
91 return 1; /* the file could have disappeared */
93 - if (!(buf = get_backup_name(fname)))
94 + buf = deleting ? get_delete_name(fname) : get_backup_name(fname);
98 /* Check to see if this is a device file, or link */
99 @@ -278,3 +304,13 @@ int make_backup(char *fname)
100 return keep_backup(fname);
101 return make_simple_backup(fname);
104 +/* backup switch routine called only when backing-up removed file */
105 +int safe_delete(char *fname)
109 + ret = make_backup(fname);
115 @@ -90,6 +90,9 @@ extern dev_t filesystem_dev;
116 extern char *backup_dir;
117 extern char *backup_suffix;
118 extern int backup_suffix_len;
119 +extern char *backup_dir_dels;
120 +extern char *backup_suffix_dels;
121 +extern int backup_suffix_dels_len;
122 extern struct file_list *the_file_list;
123 extern struct filter_list_struct server_filter_list;
125 @@ -114,10 +117,14 @@ enum delret {
126 static enum delret delete_dir_contents(char *fname, int flags);
129 +/* Function now compares both backup_suffix and backup_suffix_dels. */
130 static int is_backup_file(char *fn)
132 int k = strlen(fn) - backup_suffix_len;
133 - return k > 0 && strcmp(fn+k, backup_suffix) == 0;
134 + if (k > 0 && strcmp(fn+k, backup_suffix) == 0)
136 + k += backup_suffix_len - backup_suffix_dels_len;
137 + return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
140 /* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
141 @@ -153,9 +160,9 @@ static enum delret delete_item(char *fna
144 ok = do_rmdir(fname) == 0;
145 - } else if (make_backups && (backup_dir || !is_backup_file(fname))) {
146 + } else if (make_backups && (backup_dir_dels || !is_backup_file(fname))) {
147 what = "make_backup";
148 - ok = make_backup(fname);
149 + ok = safe_delete(fname);
152 ok = robust_unlink(fname) == 0;
155 @@ -138,10 +138,14 @@ int no_detach
158 int backup_dir_len = 0;
159 +int backup_dir_dels_len = 0;
160 int backup_suffix_len;
161 +int backup_suffix_dels_len;
162 unsigned int backup_dir_remainder;
163 +unsigned int backup_dir_dels_remainder;
165 char *backup_suffix = NULL;
166 +char *backup_suffix_dels = NULL;
168 char *partial_dir = NULL;
169 char *basis_dir[MAX_BASIS_DIRS+1];
170 @@ -153,7 +157,9 @@ char *stdout_format = NULL;
171 char *password_file = NULL;
172 char *rsync_path = RSYNC_PATH;
173 char *backup_dir = NULL;
174 +char *backup_dir_dels = NULL;
175 char backup_dir_buf[MAXPATHLEN];
176 +char backup_dir_dels_buf[MAXPATHLEN];
177 char *sockopts = NULL;
179 int compare_dest = 0;
180 @@ -292,6 +298,8 @@ void usage(enum logcode F)
181 rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
182 rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
183 rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
184 + rprintf(F," --backup-dir-dels make backups of removed files into current dir\n");
185 + rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (defaults to --suffix)\n");
186 rprintf(F," -u, --update skip files that are newer on the receiver\n");
187 rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
188 rprintf(F," --append append data onto shorter files\n");
189 @@ -518,7 +526,9 @@ static struct poptOption long_options[]
190 {"bwlimit", 0, POPT_ARG_INT, &bwlimit, 0, 0, 0 },
191 {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
192 {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
193 + {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
194 {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
195 + {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
196 {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
197 {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
198 {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
199 @@ -1232,6 +1242,8 @@ int parse_arguments(int *argc, const cha
200 tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, NULL);
202 backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, NULL);
203 + if (backup_dir_dels)
204 + backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, NULL);
206 if (server_filter_list.head && !am_sender) {
207 struct filter_list_struct *elp = &server_filter_list;
208 @@ -1249,6 +1261,14 @@ int parse_arguments(int *argc, const cha
209 if (check_filter(elp, backup_dir, 1) < 0)
210 goto options_rejected;
212 + /* Clean backup_dir_dels same as for backup_dir */
213 + if (backup_dir_dels) {
214 + if (!*backup_dir_dels)
215 + goto options_rejected;
216 + clean_fname(backup_dir_dels, 1);
217 + if (check_filter(elp, backup_dir_dels, 1) < 0)
218 + goto options_rejected;
223 @@ -1260,6 +1280,16 @@ int parse_arguments(int *argc, const cha
227 + /* if backup_suffix_dels not supplied, default to backup_suffix */
228 + if (!backup_suffix_dels)
229 + backup_suffix_dels = backup_dir_dels ? "" : backup_suffix;
230 + backup_suffix_dels_len = strlen(backup_suffix_dels);
231 + if (strchr(backup_suffix_dels, '/') != NULL) {
232 + snprintf(err_buf, sizeof err_buf,
233 + "--suffix-dels cannot contain slashes: %s\n",
234 + backup_suffix_dels);
238 backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
239 backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
240 @@ -1283,6 +1313,31 @@ int parse_arguments(int *argc, const cha
241 "P *%s", backup_suffix);
242 parse_rule(&filter_list, backup_dir_buf, 0, 0);
244 + /* If backup_dir_dels not supplied default to backup_dir if it has been supplied */
245 + if (backup_dir && !backup_dir_dels) {
246 + backup_dir_dels = backup_dir;
247 + backup_dir_dels_len = backup_dir_len;
248 + backup_dir_dels_remainder = backup_dir_remainder;
249 + strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
250 + } else if (backup_dir_dels) {
251 + backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
252 + backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len;
253 + if (backup_dir_dels_remainder < 32) {
254 + snprintf(err_buf, sizeof err_buf,
255 + "the --backup-dir-dels path is WAY too long.\n");
258 + if (backup_dir_dels_buf[backup_dir_dels_len - 1] != '/') {
259 + backup_dir_dels_buf[backup_dir_dels_len++] = '/';
260 + backup_dir_dels_buf[backup_dir_dels_len] = '\0';
262 + if (verbose > 1 && !am_sender)
263 + rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf);
264 + } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) {
265 + snprintf(err_buf, sizeof err_buf,
266 + "--suffix-dels cannot be a null string without --backup-dir-dels\n");
269 if (make_backups && !backup_dir)
272 @@ -1647,6 +1702,10 @@ void server_options(char **args,int *arg
273 args[ac++] = "--backup-dir";
274 args[ac++] = backup_dir;
276 + if (backup_dir_dels && backup_dir_dels != backup_dir) {
277 + args[ac++] = "--backup-dir-dels";
278 + args[ac++] = backup_dir_dels;
281 /* Only send --suffix if it specifies a non-default value. */
282 if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
283 @@ -1655,7 +1714,13 @@ void server_options(char **args,int *arg
288 + /* Only send --suffix-dels if it specifies a non-default value. */
289 + if (strcmp(backup_suffix_dels, backup_dir_dels ? "" : BACKUP_SUFFIX) != 0) {
290 + /* We use the following syntax to avoid weirdness with '~'. */
291 + if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
297 args[ac++] = "--delete-excluded";