mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-12-29 13:11:54 +00:00
Merge branch 'master' into int-new
This commit is contained in:
commit
4b2aef8857
@ -36,6 +36,8 @@ struct cmd_node {
|
|||||||
|
|
||||||
static struct cmd_node cmd_root;
|
static struct cmd_node cmd_root;
|
||||||
|
|
||||||
|
#define isspace_(X) isspace((unsigned char) (X))
|
||||||
|
|
||||||
void
|
void
|
||||||
cmd_build_tree(void)
|
cmd_build_tree(void)
|
||||||
{
|
{
|
||||||
@ -53,7 +55,7 @@ cmd_build_tree(void)
|
|||||||
while (*c)
|
while (*c)
|
||||||
{
|
{
|
||||||
char *d = c;
|
char *d = c;
|
||||||
while (*c && !isspace(*c))
|
while (*c && !isspace_(*c))
|
||||||
c++;
|
c++;
|
||||||
for(new=old->son; new; new=new->sibling)
|
for(new=old->son; new; new=new->sibling)
|
||||||
if (new->len == c-d && !memcmp(new->token, d, c-d))
|
if (new->len == c-d && !memcmp(new->token, d, c-d))
|
||||||
@ -71,7 +73,7 @@ cmd_build_tree(void)
|
|||||||
new->prio = (new->len == 3 && (!memcmp(new->token, "roa", 3) || !memcmp(new->token, "rip", 3))) ? 0 : 1; /* Hack */
|
new->prio = (new->len == 3 && (!memcmp(new->token, "roa", 3) || !memcmp(new->token, "rip", 3))) ? 0 : 1; /* Hack */
|
||||||
}
|
}
|
||||||
old = new;
|
old = new;
|
||||||
while (isspace(*c))
|
while (isspace_(*c))
|
||||||
c++;
|
c++;
|
||||||
}
|
}
|
||||||
if (cmd->is_real_cmd)
|
if (cmd->is_real_cmd)
|
||||||
@ -132,7 +134,7 @@ cmd_list_ambiguous(struct cmd_node *root, char *cmd, int len)
|
|||||||
struct cmd_node *m;
|
struct cmd_node *m;
|
||||||
|
|
||||||
for(m=root->son; m; m=m->sibling)
|
for(m=root->son; m; m=m->sibling)
|
||||||
if (m->len > len && !memcmp(m->token, cmd, len))
|
if (m->len > len && !memcmp(m->token, cmd, len))
|
||||||
cmd_display_help(m->help, m->cmd);
|
cmd_display_help(m->help, m->cmd);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -147,13 +149,13 @@ cmd_help(char *cmd, int len)
|
|||||||
n = &cmd_root;
|
n = &cmd_root;
|
||||||
while (cmd < end)
|
while (cmd < end)
|
||||||
{
|
{
|
||||||
if (isspace(*cmd))
|
if (isspace_(*cmd))
|
||||||
{
|
{
|
||||||
cmd++;
|
cmd++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
z = cmd;
|
z = cmd;
|
||||||
while (cmd < end && !isspace(*cmd))
|
while (cmd < end && !isspace_(*cmd))
|
||||||
cmd++;
|
cmd++;
|
||||||
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
||||||
if (ambig)
|
if (ambig)
|
||||||
@ -222,20 +224,20 @@ cmd_complete(char *cmd, int len, char *buf, int again)
|
|||||||
int ambig, cnt = 0, common;
|
int ambig, cnt = 0, common;
|
||||||
|
|
||||||
/* Find the last word we want to complete */
|
/* Find the last word we want to complete */
|
||||||
for(fin=end; fin > start && !isspace(fin[-1]); fin--)
|
for(fin=end; fin > start && !isspace_(fin[-1]); fin--)
|
||||||
;
|
;
|
||||||
|
|
||||||
/* Find the context */
|
/* Find the context */
|
||||||
n = &cmd_root;
|
n = &cmd_root;
|
||||||
while (cmd < fin && n->son)
|
while (cmd < fin && n->son)
|
||||||
{
|
{
|
||||||
if (isspace(*cmd))
|
if (isspace_(*cmd))
|
||||||
{
|
{
|
||||||
cmd++;
|
cmd++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
z = cmd;
|
z = cmd;
|
||||||
while (cmd < fin && !isspace(*cmd))
|
while (cmd < fin && !isspace_(*cmd))
|
||||||
cmd++;
|
cmd++;
|
||||||
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
||||||
if (ambig)
|
if (ambig)
|
||||||
@ -290,13 +292,13 @@ cmd_expand(char *cmd)
|
|||||||
n = &cmd_root;
|
n = &cmd_root;
|
||||||
while (*c)
|
while (*c)
|
||||||
{
|
{
|
||||||
if (isspace(*c))
|
if (isspace_(*c))
|
||||||
{
|
{
|
||||||
c++;
|
c++;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
b = c;
|
b = c;
|
||||||
while (*c && !isspace(*c))
|
while (*c && !isspace_(*c))
|
||||||
c++;
|
c++;
|
||||||
m = cmd_find_abbrev(n, b, c-b, &ambig);
|
m = cmd_find_abbrev(n, b, c-b, &ambig);
|
||||||
if (!m)
|
if (!m)
|
||||||
|
Loading…
Reference in New Issue
Block a user