sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

s3-clitar: Improve readabilty of tar_path_in_list().

Browse Source 
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
This commit is contained in:
Andreas Schneider 2014-02-17 11:12:05 +01:00
parent 2ccba45d30
commit 98ede411e3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source3/client/clitar.c
View File

@ -1268,25 +1268,27 @@ static int tar_read_inclusion_file (struct tar *t, const char* filename)
* If you want /path to be in the path list (path/a/, path/b/) set
* @reverse to true to try to match the other way around.
*/
static bool tar_path_in_list(struct tar *t, const char *path, bool reverse)
static bool tar_path_in_list(struct tar *t, const char *path, bool is_reverse)
{
int i;
const char *p = path;
const char *p;
const char *pattern;
bool res;
if (!p || !p[0])
if (path == NULL || path[0] == '\0') {
return false;
}
p = skip_useless_char_in_path(p);
p = skip_useless_char_in_path(path);
for (i = 0; i < t->path_list_size; i++) {
bool is_in_list;
pattern = skip_useless_char_in_path(t->path_list[i]);
res = is_subpath(p, pattern);
if (reverse) {
res = res || is_subpath(pattern, p);
is_in_list = is_subpath(p, pattern);
if (is_reverse) {
is_in_list = is_in_list || is_subpath(pattern, p);
}
if (res) {
if (is_in_list) {
return true;
}
}