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-deleted.diff
19 patch -p1 <patches/backup-dir-dels.diff
20 ./configure (optional if already run)
23 based-on: patch/master/backup-deleted
24 diff --git a/backup.c b/backup.c
27 @@ -29,25 +29,32 @@ extern int preserve_specials;
28 extern int preserve_links;
29 extern int safe_symlinks;
30 extern int backup_dir_len;
31 +extern int backup_dir_dels_len;
32 extern unsigned int backup_dir_remainder;
33 +extern unsigned int backup_dir_dels_remainder;
34 extern char backup_dir_buf[MAXPATHLEN];
35 +extern char backup_dir_dels_buf[MAXPATHLEN];
36 extern char *backup_suffix;
37 +extern char *backup_suffix_dels;
38 extern char *backup_dir;
39 +extern char *backup_dir_dels;
41 +static BOOL deleting;
43 /* Returns -1 on error, 0 on missing dir, and 1 on present dir. */
44 -static int validate_backup_dir(void)
45 +static int validate_backup_dir(char *buf)
49 - if (do_lstat(backup_dir_buf, &st) < 0) {
50 + if (do_lstat(buf, &st) < 0) {
53 - rsyserr(FERROR, errno, "backup lstat %s failed", backup_dir_buf);
54 + rsyserr(FERROR, errno, "backup lstat %s failed", buf);
57 if (!S_ISDIR(st.st_mode)) {
58 int flags = get_del_for_flag(st.st_mode) | DEL_FOR_BACKUP | DEL_RECURSE;
59 - if (delete_item(backup_dir_buf, st.st_mode, flags) == 0)
60 + if (delete_item(buf, st.st_mode, flags) == 0)
64 @@ -58,20 +65,20 @@ static int validate_backup_dir(void)
65 * backup_dir_buf. Any new directories (compared to the prior backup
66 * path) are ensured to exist as directories, replacing anything else
67 * that may be in the way (e.g. a symlink). */
68 -static BOOL copy_valid_path(const char *fname)
69 +static BOOL copy_valid_path(const char *fname, char *buf, int prefix_len, unsigned int remainder, const char *suffix)
75 - char *b, *rel = backup_dir_buf + backup_dir_len, *name = rel;
76 + char *b, *rel = buf + prefix_len, *name = rel;
78 for (f = fname, b = rel; *f && *f == *b; f++, b++) {
83 - if (stringjoin(rel, backup_dir_remainder, fname, backup_suffix, NULL) >= backup_dir_remainder) {
84 + if (stringjoin(rel, remainder, fname, suffix, NULL) >= remainder) {
85 rprintf(FERROR, "backup filename too long\n");
88 @@ -82,7 +89,7 @@ static BOOL copy_valid_path(const char *fname)
92 - val = validate_backup_dir();
93 + val = validate_backup_dir(buf);
97 @@ -98,9 +105,9 @@ static BOOL copy_valid_path(const char *fname)
98 for ( ; b; name = b + 1, b = strchr(name, '/')) {
101 - while (do_mkdir(backup_dir_buf, ACCESSPERMS) < 0) {
102 + while (do_mkdir(buf, ACCESSPERMS) < 0) {
103 if (errno == EEXIST) {
104 - val = validate_backup_dir();
105 + val = validate_backup_dir(buf);
109 @@ -134,7 +141,7 @@ static BOOL copy_valid_path(const char *fname)
113 - set_file_attrs(backup_dir_buf, file, NULL, NULL, 0);
114 + set_file_attrs(buf, file, NULL, NULL, 0);
118 @@ -156,28 +163,34 @@ static BOOL copy_valid_path(const char *fname)
119 /* Make a complete pathname for backup file and verify any new path elements. */
120 char *get_backup_name(const char *fname)
122 + char *buf = deleting ? backup_dir_dels_buf : backup_dir_buf;
123 + char *suffix = deleting ? backup_suffix_dels : backup_suffix;
126 static int initialized = 0;
127 - if (!initialized) {
128 + int prefix_len = deleting ? backup_dir_dels_len : backup_dir_len;
129 + unsigned int remainder = deleting ? backup_dir_dels_remainder : backup_dir_remainder;
130 + int init_bits = deleting ? 2 : 1;
131 + if (!(initialized & init_bits)) {
133 - if (backup_dir_len > 1)
134 - backup_dir_buf[backup_dir_len-1] = '\0';
135 - ret = make_path(backup_dir_buf, 0);
136 - if (backup_dir_len > 1)
137 - backup_dir_buf[backup_dir_len-1] = '/';
138 + if (prefix_len > 1)
139 + buf[prefix_len-1] = '\0';
140 + ret = make_path(buf, 0);
141 + if (prefix_len > 1)
142 + buf[prefix_len-1] = '/';
146 + initialized |= init_bits;
148 /* copy fname into backup_dir_buf while validating the dirs. */
149 - if (copy_valid_path(fname))
150 - return backup_dir_buf;
151 + if (copy_valid_path(fname, buf, prefix_len, remainder, suffix))
153 /* copy_valid_path() has printed an error message. */
157 - if (stringjoin(backup_dir_buf, MAXPATHLEN, fname, backup_suffix, NULL) < MAXPATHLEN)
158 - return backup_dir_buf;
159 + if (stringjoin(buf, MAXPATHLEN, fname, suffix, NULL) < MAXPATHLEN)
162 rprintf(FERROR, "backup filename too long\n");
164 @@ -352,3 +365,13 @@ int make_backup(const char *fname, BOOL prefer_rename)
165 rprintf(FINFO, "backed up %s to %s\n", fname, buf);
169 +/* backup switch routine called only when backing-up removed file */
170 +int safe_delete(const char *fname)
174 + ret = make_backup(fname, True);
178 diff --git a/delete.c b/delete.c
181 @@ -28,16 +28,23 @@ extern int max_delete;
182 extern char *backup_dir;
183 extern char *backup_suffix;
184 extern int backup_suffix_len;
185 +extern char *backup_dir_dels;
186 +extern char *backup_suffix_dels;
187 +extern int backup_suffix_dels_len;
188 extern struct stats stats;
190 int ignore_perishable = 0;
191 int non_perishable_cnt = 0;
192 int skipped_deletes = 0;
194 +/* Function now compares both backup_suffix and backup_suffix_dels. */
195 static inline int is_backup_file(char *fn)
197 int k = strlen(fn) - backup_suffix_len;
198 - return k > 0 && strcmp(fn+k, backup_suffix) == 0;
199 + if (k > 0 && strcmp(fn+k, backup_suffix) == 0)
201 + k += backup_suffix_len - backup_suffix_dels_len;
202 + return k > 0 && strcmp(fn+k, backup_suffix_dels) == 0;
205 /* The directory is about to be deleted: if DEL_RECURSE is given, delete all
206 @@ -162,9 +169,9 @@ enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
208 ok = do_rmdir(fbuf) == 0;
210 - if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir || !is_backup_file(fbuf))) {
211 + if (make_backups > 0 && !(flags & DEL_FOR_BACKUP) && (backup_dir_dels || !is_backup_file(fbuf))) {
212 what = "make_backup";
213 - ok = make_backup(fbuf, True);
214 + ok = safe_delete(fbuf);
217 ok = robust_unlink(fbuf) == 0;
218 diff --git a/options.c b/options.c
221 @@ -153,10 +153,14 @@ int no_detach
224 int backup_dir_len = 0;
225 +int backup_dir_dels_len = 0;
226 int backup_suffix_len;
227 +int backup_suffix_dels_len;
228 unsigned int backup_dir_remainder;
229 +unsigned int backup_dir_dels_remainder;
231 char *backup_suffix = NULL;
232 +char *backup_suffix_dels = NULL;
234 char *partial_dir = NULL;
235 char *basis_dir[MAX_BASIS_DIRS+1];
236 @@ -168,7 +172,9 @@ char *stdout_format = NULL;
237 char *password_file = NULL;
238 char *rsync_path = RSYNC_PATH;
239 char *backup_dir = NULL;
240 +char *backup_dir_dels = NULL;
241 char backup_dir_buf[MAXPATHLEN];
242 +char backup_dir_dels_buf[MAXPATHLEN];
243 char *sockopts = NULL;
244 char *usermap = NULL;
245 char *groupmap = NULL;
246 @@ -681,6 +687,8 @@ void usage(enum logcode F)
247 rprintf(F," --backup-deleted make backups only of deleted files\n");
248 rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
249 rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
250 + rprintf(F," --backup-dir-dels=DIR backup removed files into hierarchy based in DIR\n");
251 + rprintf(F," --suffix-dels=SUFFIX set removed-files suffix (def. --suffix w/o b-d-d)\n");
252 rprintf(F," -u, --update skip files that are newer on the receiver\n");
253 rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
254 rprintf(F," --append append data onto shorter files\n");
255 @@ -999,7 +1007,9 @@ static struct poptOption long_options[] = {
256 {"backup-deleted", 0, POPT_ARG_VAL, &make_backups, 1, 0, 0 },
257 {"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
258 {"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
259 + {"backup-dir-dels", 0, POPT_ARG_STRING, &backup_dir_dels, 0, 0, 0 },
260 {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
261 + {"suffix-dels", 0, POPT_ARG_STRING, &backup_suffix_dels, 0, 0, 0 },
262 {"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
263 {"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
264 {"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
265 @@ -2101,6 +2111,8 @@ int parse_arguments(int *argc_p, const char ***argv_p)
266 tmpdir = sanitize_path(NULL, tmpdir, NULL, 0, SP_DEFAULT);
268 backup_dir = sanitize_path(NULL, backup_dir, NULL, 0, SP_DEFAULT);
269 + if (backup_dir_dels)
270 + backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0, SP_DEFAULT);
272 if (daemon_filter_list.head && !am_sender) {
273 filter_rule_list *elp = &daemon_filter_list;
274 @@ -2122,6 +2134,14 @@ int parse_arguments(int *argc_p, const char ***argv_p)
275 if (check_filter(elp, FLOG, dir, 1) < 0)
276 goto options_rejected;
278 + /* Clean backup_dir_dels same as for backup_dir */
279 + if (backup_dir_dels) {
280 + if (!*backup_dir_dels)
281 + goto options_rejected;
282 + clean_fname(backup_dir_dels, 1);
283 + if (check_filter(elp, FLOG, backup_dir_dels, 1) < 0)
284 + goto options_rejected;
289 @@ -2133,6 +2153,20 @@ int parse_arguments(int *argc_p, const char ***argv_p)
293 + /* --suffix-dels defaults to --suffix, or empty for a client given an
294 + * explicit --backup-dir-dels (just as --suffix defaults to empty when
295 + * a --backup-dir is given). The second case does not apply to the
296 + * server for consistency with server_options, which sends --suffix-dels
297 + * to the server iff it differs from --suffix. */
298 + if (!backup_suffix_dels)
299 + backup_suffix_dels = backup_dir_dels && !am_server ? "" : backup_suffix;
300 + backup_suffix_dels_len = strlen(backup_suffix_dels);
301 + if (strchr(backup_suffix_dels, '/') != NULL) {
302 + snprintf(err_buf, sizeof err_buf,
303 + "--suffix-dels cannot contain slashes: %s\n",
304 + backup_suffix_dels);
309 while (*backup_dir == '.' && backup_dir[1] == '/')
310 @@ -2168,6 +2202,34 @@ int parse_arguments(int *argc_p, const char ***argv_p)
311 "P *%s", backup_suffix);
312 parse_filter_str(&filter_list, backup_dir_buf, rule_template(0), 0);
314 + if (backup_dir_dels) {
315 + backup_dir_dels_len = strlcpy(backup_dir_dels_buf, backup_dir_dels, sizeof backup_dir_dels_buf);
316 + backup_dir_dels_remainder = sizeof backup_dir_dels_buf - backup_dir_dels_len;
317 + if (backup_dir_dels_remainder < 32) {
318 + snprintf(err_buf, sizeof err_buf,
319 + "the --backup-dir-dels path is WAY too long.\n");
322 + if (backup_dir_dels_buf[backup_dir_dels_len - 1] != '/') {
323 + backup_dir_dels_buf[backup_dir_dels_len++] = '/';
324 + backup_dir_dels_buf[backup_dir_dels_len] = '\0';
326 + if (INFO_GTE(BACKUP, 1) && !am_sender)
327 + rprintf(FINFO, "backup_dir_dels is %s\n", backup_dir_dels_buf);
328 + } else if (backup_dir) {
329 + backup_dir_dels = backup_dir;
330 + backup_dir_dels_len = backup_dir_len;
331 + backup_dir_dels_remainder = backup_dir_remainder;
332 + strlcpy(backup_dir_dels_buf, backup_dir_buf, sizeof backup_dir_buf);
333 + } else if (!backup_suffix_dels_len && (!am_server || !am_sender)) {
334 + snprintf(err_buf, sizeof err_buf,
335 + "--suffix-dels cannot be a null string without --backup-dir-dels\n");
337 + } else if (make_backups && delete_mode && !delete_excluded && !am_server) {
338 + snprintf(backup_dir_dels_buf, sizeof backup_dir_dels_buf,
339 + "P *%s", backup_suffix_dels);
340 + parse_filter_str(&filter_list, backup_dir_dels_buf, rule_template(0), 0);
343 if (preserve_times) {
344 preserve_times = PRESERVE_FILE_TIMES;
345 @@ -2594,6 +2656,10 @@ void server_options(char **args, int *argc_p)
346 args[ac++] = "--backup-dir";
347 args[ac++] = backup_dir;
349 + if (backup_dir_dels && backup_dir_dels != backup_dir) {
350 + args[ac++] = "--backup-dir-dels";
351 + args[ac++] = backup_dir_dels;
354 /* Only send --suffix if it specifies a non-default value. */
355 if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
356 @@ -2602,6 +2668,14 @@ void server_options(char **args, int *argc_p)
360 + /* Only send --suffix-dels if it specifies a value different from the
361 + * --suffix value, which would normally be used for deletions too. */
362 + if (strcmp(backup_suffix_dels, backup_suffix) != 0) {
363 + /* We use the following syntax to avoid weirdness with '~'. */
364 + if (asprintf(&arg, "--suffix-dels=%s", backup_suffix_dels) < 0)
369 if (checksum_choice) {
370 if (asprintf(&arg, "--checksum-choice=%s", checksum_choice) < 0)