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
Fixed failing hunks.
[rsync/rsync-patches.git]
/
backup-dir-dels.diff
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
dd0b5b9
..
3fde3d2
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-13,7
+13,7
@@
suffix.
Marc St-Onge
Marc St-Onge
---- orig/backup.c 2005-02-22 0
2:10:16
+--- orig/backup.c 2005-02-22 0
1:57:58
+++ backup.c 2005-02-22 02:11:15
@@ -22,11 +22,17 @@
+++ backup.c 2005-02-22 02:11:15
@@ -22,11 +22,17 @@
@@
-106,8
+106,8
@@
Marc St-Onge
+ deleting = 0;
+ return ret;
+}
+ deleting = 0;
+ return ret;
+}
---- orig/generator.c 2005-03-0
5 00:25:24
-+++ generator.c 2005-03-
05 00:26:54
+--- orig/generator.c 2005-03-0
9 23:46:28
++++ generator.c 2005-03-
11 11:22:38
@@ -83,6 +83,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
@@ -83,6 +83,9 @@ extern dev_t filesystem_dev;
extern char *backup_dir;
extern char *backup_suffix;
@@
-134,10
+134,10
@@
Marc St-Onge
}
}
-@@ -112,8 +119,8 @@ static int delete_item(char *fname, int
- return -1;
-
+@@ -111,8 +118,8 @@ static int delete_item(char *fname, int
if (!S_ISDIR(mode)) {
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)))
- if (make_backups && (backup_dir || !is_backup_file(fname)))
- ok = make_backup(fname);
+ if (make_backups && (backup_dir_dels || !is_backup_file(fname)))
@@
-145,8
+145,8
@@
Marc St-Onge
else
ok = robust_unlink(fname) == 0;
if (ok) {
else
ok = robust_unlink(fname) == 0;
if (ok) {
-@@ -13
4,9 +141
,9 @@ static int delete_item(char *fname, int
-
if (dry_run && zap_dir
) {
+@@ -13
5,9 +142
,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)
ok = 0;
errno = ENOTEMPTY;
- } else if (make_backups && !backup_dir && !is_backup_file(fname)
@@
-157,7
+157,7
@@
Marc St-Onge
else
ok = do_rmdir(fname) == 0;
if (ok) {
else
ok = do_rmdir(fname) == 0;
if (ok) {
---- orig/options.c 2005-03-0
2 09:52:06
+--- orig/options.c 2005-03-0
9 18:53:53
+++ options.c 2005-03-01 01:25:39
@@ -127,10 +127,14 @@ int no_detach
int write_batch = 0;
+++ options.c 2005-03-01 01:25:39
@@ -127,10 +127,14 @@ int no_detach
int write_batch = 0;