+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-04-28 16:26:28
+--- orig/generator.c 2005-05-22 20:53:34
+++ generator.c 2005-03-11 11:22:38
-@@ -86,6 +86,9 @@ extern dev_t filesystem_dev;
+@@ -86,16 +86,23 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_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 */
}
-@@ -114,8 +121,8 @@ static int delete_item(char *fname, int
+@@ -112,8 +119,8 @@ static int delete_item(char *fname, int
if (!S_ISDIR(mode)) {
if (max_delete && ++deletion_count > max_delete)
return 0;
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -138,9 +145,9 @@ static int delete_item(char *fname, int
+@@ -136,9 +143,9 @@ static int delete_item(char *fname, int
|| (dry_run && zap_dir)) {
ok = 0;
errno = ENOTEMPTY;
else
ok = do_rmdir(fname) == 0;
if (ok) {
---- orig/options.c 2005-05-10 15:32:58
+--- orig/options.c 2005-05-19 08:52:42
+++ options.c 2005-03-01 01:25:39
@@ -128,10 +128,14 @@ int no_detach
int write_batch = 0;
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");
-@@ -371,6 +379,7 @@ static struct poptOption long_options[]
+@@ -370,6 +378,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 },
-@@ -452,6 +461,7 @@ static struct poptOption long_options[]
+@@ -451,6 +460,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 },
-@@ -1027,6 +1037,8 @@ int parse_arguments(int *argc, const cha
+@@ -1021,6 +1031,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 (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
+@@ -1055,6 +1067,14 @@ int parse_arguments(int *argc, const cha
return 0;
}
}
}
if (!backup_suffix)
-@@ -1072,6 +1092,16 @@ int parse_arguments(int *argc, const cha
+@@ -1066,6 +1086,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;
-@@ -1093,6 +1123,31 @@ int parse_arguments(int *argc, const cha
+@@ -1087,6 +1117,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;
-@@ -1373,6 +1428,10 @@ void server_options(char **args,int *arg
+@@ -1369,6 +1424,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) {
-@@ -1381,7 +1440,13 @@ void server_options(char **args,int *arg
+@@ -1377,7 +1436,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}