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.3pre2.
[rsync/rsync-patches.git]
/
backup-dir-dels.diff
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
51d8489
..
77b84ce
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-79,7
+79,7
@@
diff --git a/backup.c b/backup.c
stat_x sx;
while (*fullpath == '.' && fullpath[1] == '/') {
stat_x sx;
while (*fullpath == '.' && fullpath[1] == '/') {
-@@ -2
11,7 +23
5,8 @@ static int keep_backup(const char *fname)
+@@ -2
21,7 +24
5,8 @@ static int keep_backup(const char *fname)
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
if (!(file = make_file(fname, NULL, NULL, 0, NO_FILTERS)))
return 1; /* the file could have disappeared */
@@
-89,7
+89,7
@@
diff --git a/backup.c b/backup.c
unmake_file(file);
return 0;
}
unmake_file(file);
return 0;
}
-@@ -3
22,7 +347
,17 @@ static int keep_backup(const char *fname)
+@@ -3
58,7 +383
,17 @@ static int keep_backup(const char *fname)
/* main backup switch routine */
int make_backup(const char *fname)
{
/* main backup switch routine */
int make_backup(const char *fname)
{
@@
-215,7
+215,7
@@
diff --git a/options.c b/options.c
+ if (!*backup_dir_dels)
+ goto options_rejected;
+ clean_fname(backup_dir_dels, 1);
+ if (!*backup_dir_dels)
+ goto options_rejected;
+ clean_fname(backup_dir_dels, 1);
-+ if (check_filter(elp, backup_dir_dels, 1) < 0)
++ if (check_filter(elp,
FLOG,
backup_dir_dels, 1) < 0)
+ goto options_rejected;
+ }
}
+ goto options_rejected;
+ }
}