diff options
| author | Jason Hobbs <jason.hobbs@calxeda.com> | 2011-08-23 11:06:54 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-17 22:25:34 +0200 |
| commit | 4d91a6ecabd10652abba696e55e952676db0aae1 (patch) | |
| tree | 27336d763e25ab047dc39c4b0c1a82a7bfc1d6ce /common/command.c | |
| parent | ce2d4c9532b338e39f033ef75ae57bcb71c3389e (diff) | |
| download | olio-uboot-2014.01-4d91a6ecabd10652abba696e55e952676db0aae1.tar.xz olio-uboot-2014.01-4d91a6ecabd10652abba696e55e952676db0aae1.zip | |
Replace space and tab checks with isblank
These are various places I found that checked for conditions equivalent
to isblank.
Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Diffstat (limited to 'common/command.c')
| -rw-r--r-- | common/command.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/command.c b/common/command.c index ed931d748..2c0bf5344 100644 --- a/common/command.c +++ b/common/command.c @@ -27,6 +27,7 @@ #include <common.h> #include <command.h> +#include <linux/ctype.h> /* * Use puts() instead of printf() to avoid printf buffer overflow @@ -165,7 +166,7 @@ int var_complete(int argc, char * const argv[], char last_char, int maxv, char * static char tmp_buf[512]; int space; - space = last_char == '\0' || last_char == ' ' || last_char == '\t'; + space = last_char == '\0' || isblank(last_char); if (space && argc == 1) return env_complete("", maxv, cmdv, sizeof(tmp_buf), tmp_buf); @@ -206,7 +207,7 @@ static int complete_cmdv(int argc, char * const argv[], char last_char, int maxv } /* more than one arg or one but the start of the next */ - if (argc > 1 || (last_char == '\0' || last_char == ' ' || last_char == '\t')) { + if (argc > 1 || (last_char == '\0' || isblank(last_char))) { cmdtp = find_cmd(argv[0]); if (cmdtp == NULL || cmdtp->complete == NULL) { cmdv[0] = NULL; @@ -257,7 +258,7 @@ static int make_argv(char *s, int argvsz, char *argv[]) while (argc < argvsz - 1) { /* skip any white space */ - while ((*s == ' ') || (*s == '\t')) + while (isblank(*s)) ++s; if (*s == '\0') /* end of s, no more args */ @@ -266,7 +267,7 @@ static int make_argv(char *s, int argvsz, char *argv[]) argv[argc++] = s; /* begin of argument string */ /* find end of string */ - while (*s && (*s != ' ') && (*s != '\t')) + while (*s && !isblank(*s)) ++s; if (*s == '\0') /* end of s, no more args */ |