d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor.

Browse Source 
MFC after:	1 month
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
trasz 2015-03-10 09:53:15 +00:00
parent 3f792c66de
commit 1970982572
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
usr.sbin/autofs/common.c
View File

@ -449,6 +449,18 @@ node_expand_defined(struct node *n)
return (cumulated_error); return (cumulated_error);
} }
static bool
node_is_direct_key(const struct node *n)
{
if (n->n_parent != NULL && n->n_parent->n_parent == NULL &&
strcmp(n->n_key, "/-") == 0) {
return (true);
}
return (false);
}
bool bool
node_is_direct_map(const struct node *n) node_is_direct_map(const struct node *n)
{ {
@ -460,11 +472,7 @@ node_is_direct_map(const struct node *n)
n = n->n_parent; n = n->n_parent;
} }
assert(n->n_key != NULL); return (node_is_direct_key(n));
if (strcmp(n->n_key, "/-") != 0)
return (false);
return (true);
} }
bool bool
@ -538,11 +546,8 @@ node_path_x(const struct node *n, char *x)
* Return "/-" for direct maps only if we were asked for path * Return "/-" for direct maps only if we were asked for path
* to the "/-" node itself, not to any of its subnodes. * to the "/-" node itself, not to any of its subnodes.
*/ */
if (n->n_parent->n_parent == NULL && if (node_is_direct_key(n) && x[0] != '\0')
strcmp(n->n_key, "/-") == 0 &&
x[0] != '\0') {
return (x); return (x);
}
assert(n->n_key[0] != '\0'); assert(n->n_key[0] != '\0');
path = concat(n->n_key, '/', x); path = concat(n->n_key, '/', x);