Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
f6f74b93
Commit
f6f74b93
authored
Mar 26, 2008
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Ensure that a per-dir merge file is also loaded from implied directories
in the generator (for protocol 30, at least).
parent
7568ff44
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
8 deletions
+18
-8
generator.c
generator.c
+18
-8
No files found.
generator.c
View file @
f6f74b93
...
...
@@ -557,10 +557,13 @@ static void do_delete_pass(void)
for
(
j
=
0
;
j
<
cur_flist
->
used
;
j
++
)
{
struct
file_struct
*
file
=
cur_flist
->
sorted
[
j
];
if
(
!
(
file
->
flags
&
FLAG_CONTENT_DIR
))
f_name
(
file
,
fbuf
);
if
(
!
(
file
->
flags
&
FLAG_CONTENT_DIR
))
{
change_local_filter_dir
(
fbuf
,
strlen
(
fbuf
),
F_DEPTH
(
file
));
continue
;
}
f_name
(
file
,
fbuf
);
if
(
verbose
>
1
&&
file
->
flags
&
FLAG_TOP_DIR
)
rprintf
(
FINFO
,
"deleting in %s
\n
"
,
fbuf
);
...
...
@@ -1480,8 +1483,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
}
}
else
if
(
delete_during
&&
f_out
!=
-
1
&&
!
phase
&&
BITS_SETnUNSET
(
file
->
flags
,
FLAG_CONTENT_DIR
,
FLAG_MISSING_DIR
))
delete_in_dir
(
fname
,
file
,
&
real_sx
.
st
.
st_dev
);
&&
!
(
file
->
flags
&
FLAG_MISSING_DIR
))
{
if
(
file
->
flags
&
FLAG_CONTENT_DIR
)
delete_in_dir
(
fname
,
file
,
&
real_sx
.
st
.
st_dev
);
else
change_local_filter_dir
(
fname
,
strlen
(
fname
),
F_DEPTH
(
file
));
}
goto
cleanup
;
}
...
...
@@ -2175,16 +2183,18 @@ void generate_files(int f_out, const char *local_name)
f_name
(
fp
,
fbuf
);
ndx
=
cur_flist
->
ndx_start
-
1
;
recv_generator
(
fbuf
,
fp
,
ndx
,
itemizing
,
code
,
f_out
);
if
(
delete_during
&&
dry_run
<
2
&&
!
list_only
)
{
if
(
BITS_SETnUNSET
(
fp
->
flags
,
FLAG_CONTENT_DIR
,
FLAG_MISSING_DIR
))
{
if
(
delete_during
&&
dry_run
<
2
&&
!
list_only
&&
!
(
fp
->
flags
&
FLAG_MISSING_DIR
))
{
if
(
fp
->
flags
&
FLAG_CONTENT_DIR
)
{
dev_t
dirdev
;
if
(
one_file_system
)
{
uint32
*
devp
=
F_DIR_DEV_P
(
fp
);
dirdev
=
MAKEDEV
(
DEV_MAJOR
(
devp
),
DEV_MINOR
(
devp
));
}
else
dirdev
=
MAKEDEV
(
0
,
0
);
delete_in_dir
(
f_name
(
fp
,
fbuf
),
fp
,
&
dirdev
);
}
delete_in_dir
(
fbuf
,
fp
,
&
dirdev
);
}
else
change_local_filter_dir
(
fbuf
,
strlen
(
fbuf
),
F_DEPTH
(
fp
));
}
}
for
(
i
=
cur_flist
->
low
;
i
<=
cur_flist
->
high
;
i
++
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment