mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2024-11-08 12:18:42 +00:00
Client: Fix isspace() calls
Function isspace() expects to get *unsigned* chars (encoded as ints), not that it matters for plain ASCII.
This commit is contained in:
parent
78e4dac993
commit
c72b660b74
@ -36,6 +36,8 @@ struct cmd_node {
|
||||
|
||||
static struct cmd_node cmd_root;
|
||||
|
||||
#define isspace_(X) isspace((unsigned char) (X))
|
||||
|
||||
void
|
||||
cmd_build_tree(void)
|
||||
{
|
||||
@ -53,7 +55,7 @@ cmd_build_tree(void)
|
||||
while (*c)
|
||||
{
|
||||
char *d = c;
|
||||
while (*c && !isspace(*c))
|
||||
while (*c && !isspace_(*c))
|
||||
c++;
|
||||
for(new=old->son; new; new=new->sibling)
|
||||
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 */
|
||||
}
|
||||
old = new;
|
||||
while (isspace(*c))
|
||||
while (isspace_(*c))
|
||||
c++;
|
||||
}
|
||||
if (cmd->is_real_cmd)
|
||||
@ -147,13 +149,13 @@ cmd_help(char *cmd, int len)
|
||||
n = &cmd_root;
|
||||
while (cmd < end)
|
||||
{
|
||||
if (isspace(*cmd))
|
||||
if (isspace_(*cmd))
|
||||
{
|
||||
cmd++;
|
||||
continue;
|
||||
}
|
||||
z = cmd;
|
||||
while (cmd < end && !isspace(*cmd))
|
||||
while (cmd < end && !isspace_(*cmd))
|
||||
cmd++;
|
||||
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
||||
if (ambig)
|
||||
@ -222,20 +224,20 @@ cmd_complete(char *cmd, int len, char *buf, int again)
|
||||
int ambig, cnt = 0, common;
|
||||
|
||||
/* 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 */
|
||||
n = &cmd_root;
|
||||
while (cmd < fin && n->son)
|
||||
{
|
||||
if (isspace(*cmd))
|
||||
if (isspace_(*cmd))
|
||||
{
|
||||
cmd++;
|
||||
continue;
|
||||
}
|
||||
z = cmd;
|
||||
while (cmd < fin && !isspace(*cmd))
|
||||
while (cmd < fin && !isspace_(*cmd))
|
||||
cmd++;
|
||||
m = cmd_find_abbrev(n, z, cmd-z, &ambig);
|
||||
if (ambig)
|
||||
@ -290,13 +292,13 @@ cmd_expand(char *cmd)
|
||||
n = &cmd_root;
|
||||
while (*c)
|
||||
{
|
||||
if (isspace(*c))
|
||||
if (isspace_(*c))
|
||||
{
|
||||
c++;
|
||||
continue;
|
||||
}
|
||||
b = c;
|
||||
while (*c && !isspace(*c))
|
||||
while (*c && !isspace_(*c))
|
||||
c++;
|
||||
m = cmd_find_abbrev(n, b, c-b, &ambig);
|
||||
if (!m)
|
||||
|
Loading…
Reference in New Issue
Block a user