Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The patches for 3.0.4pre2.
[rsync/rsync-patches.git]
/
backup-dir-dels.diff
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
dc0d9f1
..
7c41181
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-111,7
+111,7
@@
diff --git a/backup.c b/backup.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
-@@ -9
6,6 +96
,9 @@ extern uid_t our_uid;
+@@ -9
7,6 +97
,9 @@ extern uid_t our_uid;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
extern char *backup_dir;
extern char *backup_suffix;
extern int backup_suffix_len;
@@
-121,7
+121,7
@@
diff --git a/generator.c b/generator.c
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
extern struct filter_list_struct daemon_filter_list;
-@@ -14
2,10 +145
,15 @@ static void handle_skipped_hlink(struct file_struct *file, int itemizing,
+@@ -14
3,10 +146
,15 @@ static void handle_skipped_hlink(struct file_struct *file, int itemizing,
enum logcode code, int f_out);
#endif
enum logcode code, int f_out);
#endif
@@
-138,7
+138,7
@@
diff --git a/generator.c b/generator.c
}
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
}
/* Delete a file or directory. If DEL_RECURSE is set in the flags, this will
-@@ -19
3,9 +201
,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
+@@ -19
4,9 +202
,9 @@ static enum delret delete_item(char *fbuf, uint16 mode, uint16 flags)
if (S_ISDIR(mode)) {
what = "rmdir";
ok = do_rmdir(fbuf) == 0;
if (S_ISDIR(mode)) {
what = "rmdir";
ok = do_rmdir(fbuf) == 0;
@@
-277,7
+277,7
@@
diff --git a/options.c b/options.c
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -19
07,6 +1969
,10 @@ void server_options(char **args, int *argc_p)
+@@ -19
15,6 +1977
,10 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
@@
-288,7
+288,7
@@
diff --git a/options.c b/options.c
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -19
15,7 +1981
,14 @@ void server_options(char **args, int *argc_p)
+@@ -19
23,7 +1989
,14 @@ void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
}
goto oom;
args[ac++] = arg;
}