+ deleting = 0;
+ return ret;
+}
---- orig/flist.c 2005-01-30 10:07:21
+--- orig/flist.c 2005-02-03 02:04:20
+++ flist.c 2005-01-30 10:11:42
@@ -47,6 +47,8 @@ extern char curr_dir[MAXPATHLEN];
extern unsigned int curr_dir_len;
extern int copy_links;
extern int copy_unsafe_links;
extern int protocol_version;
-@@ -1659,10 +1662,14 @@ char *f_name(struct file_struct *f)
+@@ -1647,10 +1650,14 @@ char *f_name(struct file_struct *f)
}
}
-@@ -1759,11 +1766,12 @@ void delete_missing(struct file_list *fu
+@@ -1739,11 +1746,12 @@ void delete_missing(struct file_list *fu
|| (delete_during && S_ISDIR(mode)
&& !S_ISDIR(full_list->files[j]->mode))) {
char *f = f_name(dir_list->files[i]);
safe_fname(f));
}
} else if (S_ISDIR(mode)) {
---- orig/options.c 2005-01-30 10:07:21
+--- orig/options.c 2005-02-01 10:39:22
+++ options.c 2005-01-28 19:17:35
@@ -119,10 +119,14 @@ int no_detach = 0;
int write_batch = 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 },
-@@ -935,6 +945,8 @@ int parse_arguments(int *argc, const cha
+@@ -938,6 +948,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);
}
-@@ -961,6 +973,12 @@ int parse_arguments(int *argc, const cha
+@@ -964,6 +976,12 @@ int parse_arguments(int *argc, const cha
if (check_filter(elp, backup_dir, 1) < 0)
goto options_rejected;
}
}
if (server_filter_list.head && files_from) {
clean_fname(files_from, 1);
-@@ -981,6 +999,16 @@ int parse_arguments(int *argc, const cha
+@@ -984,6 +1002,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;
-@@ -1000,6 +1028,31 @@ int parse_arguments(int *argc, const cha
+@@ -1003,6 +1031,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;
-@@ -1217,6 +1270,10 @@ void server_options(char **args,int *arg
+@@ -1220,6 +1273,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) {
-@@ -1225,7 +1282,13 @@ void server_options(char **args,int *arg
+@@ -1228,7 +1285,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}