Marc St-Onge
---- orig/backup.c 2005-02-22 02:10:16
+--- orig/backup.c 2005-02-22 01:57:58
+++ backup.c 2005-02-22 02:11:15
@@ -22,11 +22,17 @@
+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-02-27 07:50:58
-+++ generator.c 2005-02-26 19:31:06
-@@ -82,16 +82,23 @@ extern dev_t filesystem_dev;
+--- orig/generator.c 2005-04-28 16:26:28
++++ generator.c 2005-03-11 11:22:38
+@@ -86,6 +86,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
+extern char *backup_dir_dels;
+extern char *backup_suffix_dels;
+extern int backup_suffix_dels_len;
-
+ extern struct file_list *the_file_list;
extern struct filter_list_struct server_filter_list;
+@@ -94,10 +97,14 @@ int allowed_lull = 0;
static int deletion_count = 0; /* used to implement --max-delete */
-+/* Function now checks if file matches backup- or delete-suffix patterns. */
++/* Function now compares both backup_suffix and backup_suffix_dels. */
static int is_backup_file(char *fn)
{
int k = strlen(fn) - backup_suffix_len;
}
-@@ -109,8 +116,8 @@ static int delete_item(char *fname, int
- return -1;
-
+@@ -114,8 +121,8 @@ static int delete_item(char *fname, int
if (!S_ISDIR(mode)) {
+ if (max_delete && ++deletion_count > max_delete)
+ return 0;
- if (make_backups && (backup_dir || !is_backup_file(fname)))
- ok = make_backup(fname);
+ if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -131,9 +138,9 @@ static int delete_item(char *fname, int
- if (dry_run && zap_dir) {
+@@ -138,9 +145,9 @@ static int delete_item(char *fname, int
+ || (dry_run && zap_dir)) {
ok = 0;
errno = ENOTEMPTY;
- } else if (make_backups && !backup_dir && !is_backup_file(fname)
else
ok = do_rmdir(fname) == 0;
if (ok) {
---- orig/options.c 2005-02-25 18:44:31
-+++ options.c 2005-02-21 11:02:45
-@@ -127,10 +127,14 @@ int no_detach
+--- orig/options.c 2005-05-03 16:47:32
++++ options.c 2005-03-01 01:25:39
+@@ -128,10 +128,14 @@ int no_detach
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];
-@@ -140,7 +144,9 @@ char *log_format = NULL;
+@@ -141,7 +145,9 @@ char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
+char backup_dir_dels_buf[MAXPATHLEN];
int rsync_port = 0;
int compare_dest = 0;
- int link_dest = 0;
-@@ -270,6 +276,8 @@ void usage(enum logcode F)
+ int copy_dest = 0;
+@@ -272,6 +278,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);
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," -d, --dirs transfer directories without recursing\n");
-@@ -364,6 +372,7 @@ static struct poptOption long_options[]
+@@ -371,6 +379,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 },
-@@ -443,6 +452,7 @@ static struct poptOption long_options[]
+@@ -452,6 +461,7 @@ static struct poptOption long_options[]
{"itemize-changes", 'i', POPT_ARG_NONE, &itemize_changes, 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 },
-@@ -1004,6 +1014,8 @@ int parse_arguments(int *argc, const cha
+@@ -1027,6 +1037,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 (backup_dir_dels)
+ backup_dir_dels = sanitize_path(NULL, backup_dir_dels, NULL, 0);
- if (files_from)
- files_from = sanitize_path(NULL, files_from, NULL, 0);
}
-@@ -1036,6 +1048,12 @@ int parse_arguments(int *argc, const cha
- if (check_filter(elp, backup_dir, 1) < 0)
- goto options_rejected;
+ if (server_filter_list.head && !am_sender) {
+ struct filter_list_struct *elp = &server_filter_list;
+@@ -1061,6 +1073,14 @@ int parse_arguments(int *argc, const cha
+ return 0;
+ }
}
+ /* Clean backup_dir_dels same as for backup_dir */
+ if (backup_dir_dels) {
++ if (!*backup_dir_dels)
++ goto options_rejected;
+ clean_fname(backup_dir_dels, 1);
+ if (check_filter(elp, backup_dir_dels, 1) < 0)
+ goto options_rejected;
+ }
}
- if (server_filter_list.head && files_from) {
- if (!*files_from)
-@@ -1058,6 +1076,16 @@ int parse_arguments(int *argc, const cha
+
+ if (!backup_suffix)
+@@ -1072,6 +1092,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;
-@@ -1079,6 +1107,31 @@ int parse_arguments(int *argc, const cha
+@@ -1093,6 +1123,31 @@ int parse_arguments(int *argc, const cha
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -1346,6 +1399,10 @@ void server_options(char **args,int *arg
+@@ -1373,6 +1428,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) {
-@@ -1354,7 +1411,13 @@ void server_options(char **args,int *arg
+@@ -1381,7 +1440,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}
git.samba.org / rsync-patches.git / blobdiff