Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
022dec7
)
Made the FLAG_MOUNT_DIR bit only honored on a directory.
author
Wayne Davison
<wayned@samba.org>
Mon, 17 Mar 2008 00:52:01 +0000
(17:52 -0700)
committer
Wayne Davison
<wayned@samba.org>
Mon, 17 Mar 2008 00:52:31 +0000
(17:52 -0700)
generator.c
patch
|
blob
|
blame
|
history
diff --git
a/generator.c
b/generator.c
index
e189ddd
..
10500a9
100644
(file)
--- a/
generator.c
+++ b/
generator.c
@@
-279,7
+279,7
@@
static enum delret delete_dir_contents(char *fname, uint16 flags)
for (j = dirlist->used; j--; ) {
struct file_struct *fp = dirlist->files[j];
for (j = dirlist->used; j--; ) {
struct file_struct *fp = dirlist->files[j];
- if (fp->flags & FLAG_MOUNT_DIR) {
+ if (fp->flags & FLAG_MOUNT_DIR
&& S_ISDIR(fp->mode)
) {
if (verbose > 1) {
rprintf(FINFO,
"mount point, %s, pins parent directory\n",
if (verbose > 1) {
rprintf(FINFO,
"mount point, %s, pins parent directory\n",
@@
-511,7
+511,7
@@
static void delete_in_dir(char *fbuf, struct file_struct *file, dev_t *fs_dev)
struct file_struct *fp = dirlist->files[i];
if (!F_IS_ACTIVE(fp))
continue;
struct file_struct *fp = dirlist->files[i];
if (!F_IS_ACTIVE(fp))
continue;
- if (fp->flags & FLAG_MOUNT_DIR) {
+ if (fp->flags & FLAG_MOUNT_DIR
&& S_ISDIR(fp->mode)
) {
if (verbose > 1)
rprintf(FINFO, "cannot delete mount point: %s\n",
f_name(fp, NULL));
if (verbose > 1)
rprintf(FINFO, "cannot delete mount point: %s\n",
f_name(fp, NULL));