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
798cde47
Commit
798cde47
authored
Oct 12, 2006
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some minor improvements to parse_merge_name().
parent
558d482c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
exclude.c
exclude.c
+11
-12
No files found.
exclude.c
View file @
798cde47
...
...
@@ -303,24 +303,23 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr,
merge_file
);
return
NULL
;
}
fn_len
=
strlen
(
fn
);
}
else
{
strlcpy
(
fn
,
merge_file
,
len_ptr
?
*
len_ptr
+
1
:
MAXPATHLEN
);
clean_fname
(
fn
,
1
);
fn_len
=
clean_fname
(
fn
,
1
);
}
fn_len
=
strlen
(
fn
);
if
(
fn
==
buf
)
goto
done
;
if
(
dirbuf_len
+
fn_len
>=
MAXPATHLEN
)
{
rprintf
(
FERROR
,
"merge-file name overflows: %s
\n
"
,
fn
);
return
NULL
;
/* If the name isn't in buf yet, it's wasn't absolute. */
if
(
fn
!=
buf
)
{
if
(
dirbuf_len
+
fn_len
>=
MAXPATHLEN
)
{
rprintf
(
FERROR
,
"merge-file name overflows: %s
\n
"
,
fn
);
return
NULL
;
}
memcpy
(
buf
,
dirbuf
+
prefix_skip
,
dirbuf_len
-
prefix_skip
);
memcpy
(
buf
+
dirbuf_len
-
prefix_skip
,
fn
,
fn_len
+
1
);
fn_len
=
clean_fname
(
buf
,
1
);
}
memcpy
(
buf
,
dirbuf
+
prefix_skip
,
dirbuf_len
-
prefix_skip
);
memcpy
(
buf
+
dirbuf_len
-
prefix_skip
,
fn
,
fn_len
+
1
);
fn_len
=
clean_fname
(
buf
,
1
);
done:
if
(
len_ptr
)
*
len_ptr
=
fn_len
;
return
buf
;
...
...
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