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
54410882
Commit
54410882
authored
Sep 23, 2007
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added the relnamecache structure and improved some variable names.
parent
d0a6cdb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
20 deletions
+27
-20
flist.c
flist.c
+21
-19
rsync.h
rsync.h
+6
-1
No files found.
flist.c
View file @
54410882
...
...
@@ -1495,8 +1495,9 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
char
*
start
,
char
*
limit
,
int
flags
,
int
is_dot_dir
)
{
struct
file_struct
*
file
;
item_list
*
rel_list
;
char
**
ep
,
*
slash
;
item_list
*
relname_list
;
relnamecache
**
rnpp
;
char
*
slash
;
int
len
,
need_new_dir
;
flags
&=
~
FLAG_XFER_DIR
;
...
...
@@ -1548,23 +1549,23 @@ static void send_implied_dirs(int f, struct file_list *flist, char *fname,
return
;
/* dir must have vanished */
len
=
strlen
(
limit
+
1
);
memcpy
(
&
rel
_list
,
F_DIR_RELS_P
(
lastpath_struct
),
sizeof
rel
_list
);
if
(
!
rel_list
)
{
if
(
!
(
rel_list
=
new0
(
item_list
)))
memcpy
(
&
rel
name_list
,
F_DIR_RELNAMES_P
(
lastpath_struct
),
sizeof
relname
_list
);
if
(
!
rel
name
_list
)
{
if
(
!
(
rel
name
_list
=
new0
(
item_list
)))
out_of_memory
(
"send_implied_dirs"
);
memcpy
(
F_DIR_REL
S_P
(
lastpath_struct
),
&
rel_list
,
sizeof
rel
_list
);
memcpy
(
F_DIR_REL
NAMES_P
(
lastpath_struct
),
&
relname_list
,
sizeof
relname
_list
);
}
ep
=
EXPAND_ITEM_LIST
(
rel_list
,
char
*
,
32
);
if
(
!
(
*
ep
=
new_array
(
char
,
1
+
len
+
1
)))
rnpp
=
EXPAND_ITEM_LIST
(
relname_list
,
relnamecache
*
,
32
);
if
(
!
(
*
rnpp
=
(
relnamecache
*
)
new_array
(
char
,
sizeof
(
relnamecache
)
+
len
)))
out_of_memory
(
"send_implied_dirs"
);
**
ep
=
is_dot_dir
;
strlcpy
(
*
ep
+
1
,
limit
+
1
,
len
+
1
);
(
*
rnpp
)
->
is_dot_dir
=
is_dot_dir
;
strlcpy
(
(
*
rnpp
)
->
fname
,
limit
+
1
,
len
+
1
);
}
static
void
send1extra
(
int
f
,
struct
file_struct
*
file
,
struct
file_list
*
flist
)
{
char
fbuf
[
MAXPATHLEN
];
item_list
*
rel_list
;
item_list
*
rel
name
_list
;
int
len
,
dlen
,
flags
=
FLAG_DIVERT_DIRS
|
FLAG_XFER_DIR
;
size_t
j
;
...
...
@@ -1584,17 +1585,18 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
if
(
!
relative_paths
)
return
;
memcpy
(
&
rel
_list
,
F_DIR_RELS_P
(
file
),
sizeof
rel
_list
);
if
(
!
rel_list
)
memcpy
(
&
rel
name_list
,
F_DIR_RELNAMES_P
(
file
),
sizeof
relname
_list
);
if
(
!
rel
name
_list
)
return
;
for
(
j
=
0
;
j
<
rel_list
->
count
;
j
++
)
{
char
*
slash
,
*
ep
=
((
char
**
)
rel_list
->
items
)[
j
];
int
is_dot_dir
=
*
ep
;
for
(
j
=
0
;
j
<
relname_list
->
count
;
j
++
)
{
char
*
slash
;
relnamecache
*
rnp
=
((
relnamecache
**
)
relname_list
->
items
)[
j
];
int
is_dot_dir
=
rnp
->
is_dot_dir
;
fbuf
[
dlen
]
=
'/'
;
len
=
strlcpy
(
fbuf
+
dlen
+
1
,
ep
+
1
,
sizeof
fbuf
-
dlen
-
1
);
free
(
e
p
);
len
=
strlcpy
(
fbuf
+
dlen
+
1
,
rnp
->
fname
,
sizeof
fbuf
-
dlen
-
1
);
free
(
rn
p
);
if
(
len
>=
(
int
)
sizeof
fbuf
)
continue
;
/* Impossible... */
...
...
@@ -1622,7 +1624,7 @@ static void send1extra(int f, struct file_struct *file, struct file_list *flist)
}
}
free
(
rel_list
);
free
(
rel
name
_list
);
}
void
send_extra_file_list
(
int
f
,
int
at_least
)
...
...
rsync.h
View file @
54410882
...
...
@@ -625,7 +625,7 @@ extern int xattrs_ndx;
#define F_HL_PREV(f) OPT_EXTRA(f, LEN64_BUMP(f)+inc_recurse)->num
/* non-dirs */
#define F_DIR_NODE_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) \
+ DIRNODE_EXTRA_CNT - 1)->num)
/* sender dirs */
#define F_DIR_RELS_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + DIRNODE_EXTRA_CNT \
#define F_DIR_REL
NAME
S_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + DIRNODE_EXTRA_CNT \
+ PTR_EXTRA_CNT - 1)->num)
/* sender dirs */
#define F_DIR_DEFACL(f) OPT_EXTRA(f, LEN64_BUMP(f))->unum
/* receiver dirs */
#define F_DIR_DEV_P(f) (&OPT_EXTRA(f, LEN64_BUMP(f) + ACL_BUMP(f) \
...
...
@@ -813,6 +813,11 @@ typedef struct {
#define RL_DUMP_COMMENTS (1<<1)
#define RL_CONVERT (1<<2)
typedef
struct
{
char
is_dot_dir
;
char
fname
[
1
];
/* has variable size */
}
relnamecache
;
#include "byteorder.h"
#include "lib/mdigest.h"
#include "lib/wildmatch.h"
...
...
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