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
c284f34a
Commit
c284f34a
authored
Feb 03, 2004
by
Wayne Davison
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some indentation fixes and the removal of some superfluous parens.
parent
5f5be796
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
39 additions
and
36 deletions
+39
-36
util.c
util.c
+39
-36
No files found.
util.c
View file @
c284f34a
...
@@ -111,14 +111,14 @@ void print_child_argv(char **cmd)
...
@@ -111,14 +111,14 @@ void print_child_argv(char **cmd)
void
out_of_memory
(
char
*
str
)
void
out_of_memory
(
char
*
str
)
{
{
rprintf
(
FERROR
,
"ERROR: out of memory in %s
\n
"
,
str
);
rprintf
(
FERROR
,
"ERROR: out of memory in %s
\n
"
,
str
);
exit_cleanup
(
RERR_MALLOC
);
exit_cleanup
(
RERR_MALLOC
);
}
}
void
overflow
(
char
*
str
)
void
overflow
(
char
*
str
)
{
{
rprintf
(
FERROR
,
"ERROR: buffer overflow in %s
\n
"
,
str
);
rprintf
(
FERROR
,
"ERROR: buffer overflow in %s
\n
"
,
str
);
exit_cleanup
(
RERR_MALLOC
);
exit_cleanup
(
RERR_MALLOC
);
}
}
...
@@ -167,11 +167,13 @@ int create_directory_path(char *fname, int base_umask)
...
@@ -167,11 +167,13 @@ int create_directory_path(char *fname, int base_umask)
{
{
char
*
p
;
char
*
p
;
while
(
*
fname
==
'/'
)
fname
++
;
while
(
*
fname
==
'/'
)
while
(
strncmp
(
fname
,
"./"
,
2
)
==
0
)
fname
+=
2
;
fname
++
;
while
(
strncmp
(
fname
,
"./"
,
2
)
==
0
)
fname
+=
2
;
p
=
fname
;
p
=
fname
;
while
((
p
=
strchr
(
p
,
'/'
))
)
{
while
((
p
=
strchr
(
p
,
'/'
))
!=
NULL
)
{
*
p
=
0
;
*
p
=
0
;
do_mkdir
(
fname
,
0777
&
~
base_umask
);
do_mkdir
(
fname
,
0777
&
~
base_umask
);
*
p
=
'/'
;
*
p
=
'/'
;
...
@@ -314,15 +316,14 @@ int robust_unlink(char *fname)
...
@@ -314,15 +316,14 @@ int robust_unlink(char *fname)
char
path
[
MAXPATHLEN
];
char
path
[
MAXPATHLEN
];
rc
=
do_unlink
(
fname
);
rc
=
do_unlink
(
fname
);
if
(
(
rc
==
0
)
||
(
errno
!=
ETXTBSY
)
)
if
(
rc
==
0
||
errno
!=
ETXTBSY
)
return
rc
;
return
rc
;
strlcpy
(
path
,
fname
,
MAXPATHLEN
);
if
((
pos
=
strlcpy
(
path
,
fname
,
MAXPATHLEN
))
>=
MAXPATHLEN
)
pos
=
MAXPATHLEN
-
1
;
pos
=
strlen
(
path
);
while
(
pos
>
0
&&
path
[
pos
-
1
]
!=
'/'
)
while
((
path
[
--
pos
]
!=
'/'
)
&&
(
pos
>=
0
))
pos
--
;
;
++
pos
;
pos
+=
strlcpy
(
path
+
pos
,
".rsync"
,
MAXPATHLEN
-
pos
);
pos
+=
strlcpy
(
path
+
pos
,
".rsync"
,
MAXPATHLEN
-
pos
);
if
(
pos
>
(
MAXPATHLEN
-
MAX_RENAMES_DIGITS
-
1
))
{
if
(
pos
>
(
MAXPATHLEN
-
MAX_RENAMES_DIGITS
-
1
))
{
...
@@ -336,7 +337,7 @@ int robust_unlink(char *fname)
...
@@ -336,7 +337,7 @@ int robust_unlink(char *fname)
sprintf
(
&
path
[
pos
],
"%03d"
,
counter
);
sprintf
(
&
path
[
pos
],
"%03d"
,
counter
);
if
(
++
counter
>=
MAX_RENAMES
)
if
(
++
counter
>=
MAX_RENAMES
)
counter
=
1
;
counter
=
1
;
}
while
((
(
rc
=
access
(
path
,
0
))
==
0
)
&&
(
counter
!=
start
)
);
}
while
((
rc
=
access
(
path
,
0
))
==
0
&&
counter
!=
start
);
if
(
verbose
>
0
)
{
if
(
verbose
>
0
)
{
rprintf
(
FINFO
,
"renaming %s to %s because of text busy
\n
"
,
rprintf
(
FINFO
,
"renaming %s to %s because of text busy
\n
"
,
...
@@ -358,7 +359,7 @@ int robust_rename(char *from, char *to)
...
@@ -358,7 +359,7 @@ int robust_rename(char *from, char *to)
return
do_rename
(
from
,
to
);
return
do_rename
(
from
,
to
);
#else
#else
int
rc
=
do_rename
(
from
,
to
);
int
rc
=
do_rename
(
from
,
to
);
if
(
(
rc
==
0
)
||
(
errno
!=
ETXTBSY
)
)
if
(
rc
==
0
||
errno
!=
ETXTBSY
)
return
rc
;
return
rc
;
if
(
robust_unlink
(
to
)
!=
0
)
if
(
robust_unlink
(
to
)
!=
0
)
return
-
1
;
return
-
1
;
...
@@ -497,13 +498,15 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
...
@@ -497,13 +498,15 @@ static void glob_expand_one(char *s, char **argv, int *argc, int maxargs)
globfree
(
&
globbuf
);
globfree
(
&
globbuf
);
return
;
return
;
}
}
for
(
i
=
0
;
i
<
(
maxargs
-
(
*
argc
))
&&
i
<
(
int
)
globbuf
.
gl_pathc
;
i
++
)
{
for
(
i
=
0
;
i
<
maxargs
-
*
argc
&&
i
<
(
int
)
globbuf
.
gl_pathc
;
i
++
)
{
if
(
i
==
0
)
free
(
s
);
if
(
i
==
0
)
argv
[(
*
argc
)
+
i
]
=
strdup
(
globbuf
.
gl_pathv
[
i
]);
free
(
s
);
if
(
!
argv
[(
*
argc
)
+
i
])
out_of_memory
(
"glob_expand"
);
argv
[
*
argc
+
i
]
=
strdup
(
globbuf
.
gl_pathv
[
i
]);
if
(
!
argv
[
*
argc
+
i
])
out_of_memory
(
"glob_expand"
);
}
}
globfree
(
&
globbuf
);
globfree
(
&
globbuf
);
(
*
argc
)
+=
i
;
*
argc
+=
i
;
#endif
#endif
}
}
...
@@ -527,14 +530,15 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs)
...
@@ -527,14 +530,15 @@ void glob_expand(char *base1, char **argv, int *argc, int maxargs)
base_len
++
;
base_len
++
;
q
=
s
;
q
=
s
;
while
((
p
=
strstr
(
q
,
base
))
&&
((
*
argc
)
<
maxargs
)
)
{
while
((
p
=
strstr
(
q
,
base
))
!=
NULL
&&
*
argc
<
maxargs
)
{
/* split it at this point */
/* split it at this point */
*
p
=
0
;
*
p
=
0
;
glob_expand_one
(
q
,
argv
,
argc
,
maxargs
);
glob_expand_one
(
q
,
argv
,
argc
,
maxargs
);
q
=
p
+
base_len
;
q
=
p
+
base_len
;
}
}
if
(
*
q
&&
(
*
argc
<
maxargs
))
glob_expand_one
(
q
,
argv
,
argc
,
maxargs
);
if
(
*
q
&&
*
argc
<
maxargs
)
glob_expand_one
(
q
,
argv
,
argc
,
maxargs
);
free
(
s
);
free
(
s
);
free
(
base
);
free
(
base
);
...
@@ -615,7 +619,7 @@ void clean_fname(char *name)
...
@@ -615,7 +619,7 @@ void clean_fname(char *name)
while
(
modified
)
{
while
(
modified
)
{
modified
=
0
;
modified
=
0
;
if
((
p
=
strstr
(
name
,
"/./"
))
)
{
if
((
p
=
strstr
(
name
,
"/./"
))
!=
NULL
)
{
modified
=
1
;
modified
=
1
;
while
(
*
p
)
{
while
(
*
p
)
{
p
[
0
]
=
p
[
2
];
p
[
0
]
=
p
[
2
];
...
@@ -623,7 +627,7 @@ void clean_fname(char *name)
...
@@ -623,7 +627,7 @@ void clean_fname(char *name)
}
}
}
}
if
((
p
=
strstr
(
name
,
"//"
))
)
{
if
((
p
=
strstr
(
name
,
"//"
))
!=
NULL
)
{
modified
=
1
;
modified
=
1
;
while
(
*
p
)
{
while
(
*
p
)
{
p
[
0
]
=
p
[
1
];
p
[
0
]
=
p
[
1
];
...
@@ -631,14 +635,14 @@ void clean_fname(char *name)
...
@@ -631,14 +635,14 @@ void clean_fname(char *name)
}
}
}
}
if
(
strncmp
(
p
=
name
,
"./"
,
2
)
==
0
)
{
if
(
strncmp
(
p
=
name
,
"./"
,
2
)
==
0
)
{
modified
=
1
;
modified
=
1
;
do
{
do
{
p
[
0
]
=
p
[
2
];
p
[
0
]
=
p
[
2
];
}
while
(
*
p
++
);
}
while
(
*
p
++
);
}
}
l
=
strlen
(
p
=
name
);
l
=
strlen
(
p
=
name
);
if
(
l
>
1
&&
p
[
l
-
1
]
==
'/'
)
{
if
(
l
>
1
&&
p
[
l
-
1
]
==
'/'
)
{
modified
=
1
;
modified
=
1
;
p
[
l
-
1
]
=
0
;
p
[
l
-
1
]
=
0
;
...
@@ -697,7 +701,7 @@ void sanitize_path(char *p, char *reldir)
...
@@ -697,7 +701,7 @@ void sanitize_path(char *p, char *reldir)
* both p (and sanp if the original had a slash) should
* both p (and sanp if the original had a slash) should
* always be left pointing after a slash
* always be left pointing after a slash
*/
*/
if
(
(
*
p
==
'.'
)
&&
((
*
(
p
+
1
)
==
'/'
)
||
(
*
(
p
+
1
)
==
'\0'
)
))
{
if
(
*
p
==
'.'
&&
(
p
[
1
]
==
'/'
||
p
[
1
]
==
'\0'
))
{
/* skip "." component */
/* skip "." component */
while
(
*++
p
==
'/'
)
{
while
(
*++
p
==
'/'
)
{
/* skip following slashes */
/* skip following slashes */
...
@@ -706,10 +710,9 @@ void sanitize_path(char *p, char *reldir)
...
@@ -706,10 +710,9 @@ void sanitize_path(char *p, char *reldir)
continue
;
continue
;
}
}
allowdotdot
=
0
;
allowdotdot
=
0
;
if
((
*
p
==
'.'
)
&&
(
*
(
p
+
1
)
==
'.'
)
&&
if
(
*
p
==
'.'
&&
p
[
1
]
==
'.'
&&
(
p
[
2
]
==
'/'
||
p
[
2
]
==
'\0'
))
{
((
*
(
p
+
2
)
==
'/'
)
||
(
*
(
p
+
2
)
==
'\0'
)))
{
/* ".." component followed by slash or end */
/* ".." component followed by slash or end */
if
(
(
depth
>
0
)
&&
(
sanp
==
start
)
)
{
if
(
depth
>
0
&&
sanp
==
start
)
{
/* allow depth levels of .. at the beginning */
/* allow depth levels of .. at the beginning */
--
depth
;
--
depth
;
allowdotdot
=
1
;
allowdotdot
=
1
;
...
@@ -720,7 +723,7 @@ void sanitize_path(char *p, char *reldir)
...
@@ -720,7 +723,7 @@ void sanitize_path(char *p, char *reldir)
if
(
sanp
!=
start
)
{
if
(
sanp
!=
start
)
{
/* back up sanp one level */
/* back up sanp one level */
--
sanp
;
/* now pointing at slash */
--
sanp
;
/* now pointing at slash */
while
(
(
sanp
>
start
)
&&
(
*
(
sanp
-
1
)
!=
'/'
)
)
{
while
(
sanp
>
start
&&
sanp
[
-
1
]
!=
'/'
)
{
/* skip back up to slash */
/* skip back up to slash */
sanp
--
;
sanp
--
;
}
}
...
@@ -731,7 +734,7 @@ void sanitize_path(char *p, char *reldir)
...
@@ -731,7 +734,7 @@ void sanitize_path(char *p, char *reldir)
while
(
1
)
{
while
(
1
)
{
/* copy one component through next slash */
/* copy one component through next slash */
*
sanp
++
=
*
p
++
;
*
sanp
++
=
*
p
++
;
if
(
(
*
p
==
'\0'
)
||
(
*
(
p
-
1
)
==
'/'
)
)
{
if
(
*
p
==
'\0'
||
p
[
1
]
==
'/'
)
{
while
(
*
p
==
'/'
)
{
while
(
*
p
==
'/'
)
{
/* skip multiple slashes */
/* skip multiple slashes */
p
++
;
p
++
;
...
@@ -744,7 +747,7 @@ void sanitize_path(char *p, char *reldir)
...
@@ -744,7 +747,7 @@ void sanitize_path(char *p, char *reldir)
start
=
sanp
;
start
=
sanp
;
}
}
}
}
if
(
(
sanp
==
start
)
&&
!
allowdotdot
)
{
if
(
sanp
==
start
&&
!
allowdotdot
)
{
/* ended up with nothing, so put in "." component */
/* ended up with nothing, so put in "." component */
/*
/*
* note that the !allowdotdot doesn't prevent this from
* note that the !allowdotdot doesn't prevent this from
...
@@ -917,7 +920,7 @@ int unsafe_symlink(const char *dest, const char *src)
...
@@ -917,7 +920,7 @@ int unsafe_symlink(const char *dest, const char *src)
/* find out what our safety margin is */
/* find out what our safety margin is */
for
(
name
=
src
;
(
slash
=
strchr
(
name
,
'/'
))
!=
0
;
name
=
slash
+
1
)
{
for
(
name
=
src
;
(
slash
=
strchr
(
name
,
'/'
))
!=
0
;
name
=
slash
+
1
)
{
if
(
strncmp
(
name
,
"../"
,
3
)
==
0
)
{
if
(
strncmp
(
name
,
"../"
,
3
)
==
0
)
{
depth
=
0
;
depth
=
0
;
}
else
if
(
strncmp
(
name
,
"./"
,
2
)
==
0
)
{
}
else
if
(
strncmp
(
name
,
"./"
,
2
)
==
0
)
{
/* nothing */
/* nothing */
}
else
{
}
else
{
...
@@ -976,8 +979,8 @@ char *timestring(time_t t)
...
@@ -976,8 +979,8 @@ char *timestring(time_t t)
**/
**/
int
msleep
(
int
t
)
int
msleep
(
int
t
)
{
{
int
tdiff
=
0
;
int
tdiff
=
0
;
struct
timeval
tval
,
t1
,
t2
;
struct
timeval
tval
,
t1
,
t2
;
gettimeofday
(
&
t1
,
NULL
);
gettimeofday
(
&
t1
,
NULL
);
gettimeofday
(
&
t2
,
NULL
);
gettimeofday
(
&
t2
,
NULL
);
...
...
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