diff options
Diffstat (limited to 'shell/ash.c')
-rw-r--r-- | shell/ash.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index a5ffaaf8e..950cdaa02 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -6967,6 +6967,11 @@ tokname(int tok) | |||
6967 | { | 6967 | { |
6968 | static char buf[16]; | 6968 | static char buf[16]; |
6969 | 6969 | ||
6970 | //try this: | ||
6971 | //if (tok < TSEMI) return tokname_array[tok] + 1; | ||
6972 | //sprintf(buf, "\"%s\"", tokname_array[tok] + 1); | ||
6973 | //return buf; | ||
6974 | |||
6970 | if (tok >= TSEMI) | 6975 | if (tok >= TSEMI) |
6971 | buf[0] = '"'; | 6976 | buf[0] = '"'; |
6972 | sprintf(buf + (tok >= TSEMI), "%s%c", | 6977 | sprintf(buf + (tok >= TSEMI), "%s%c", |
@@ -6978,15 +6983,15 @@ tokname(int tok) | |||
6978 | static int | 6983 | static int |
6979 | pstrcmp(const void *a, const void *b) | 6984 | pstrcmp(const void *a, const void *b) |
6980 | { | 6985 | { |
6981 | return strcmp((const char *) a, (*(const char *const *) b) + 1); | 6986 | return strcmp((char*) a, (*(char**) b) + 1); |
6982 | } | 6987 | } |
6983 | 6988 | ||
6984 | static const char *const * | 6989 | static const char *const * |
6985 | findkwd(const char *s) | 6990 | findkwd(const char *s) |
6986 | { | 6991 | { |
6987 | return bsearch(s, tokname_array + KWDOFFSET, | 6992 | return bsearch(s, tokname_array + KWDOFFSET, |
6988 | (sizeof(tokname_array) / sizeof(const char *)) - KWDOFFSET, | 6993 | (sizeof(tokname_array) / sizeof(char *)) - KWDOFFSET, |
6989 | sizeof(const char *), pstrcmp); | 6994 | sizeof(char *), pstrcmp); |
6990 | } | 6995 | } |
6991 | 6996 | ||
6992 | /* | 6997 | /* |