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

1) Remove single occurance of HAS_CTYPE ifdef, ctype functions

Browse Source 
used here for a long time and needs their header in anycase.
2) Add (unsigned char) casts to more ctype macros.
3) Simplify menu input handling using ctype instead of range unguarded
hardcoded tricks.
This commit is contained in:
Andrey A. Chernov 2009-09-04 07:42:13 +00:00
parent d0ac01f1f6
commit 31dcbfad38
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
contrib/ee/ee.c
View File

@ -72,10 +72,7 @@ char *version = "@(#) ee, version " EE_VERSION " $Revision: 1.102 $";
#include <curses.h>
#endif
#ifdef HAS_CTYPE
#include <ctype.h>
#endif
#include <signal.h>
#include <fcntl.h>
#include <sys/types.h>
@ -1973,7 +1970,7 @@ int sensitive;
}
else
{
if (toupper(*strng1) != toupper(*strng2))
if (toupper((unsigned char)*strng1) != toupper((unsigned char)*strng2))
equal = FALSE;
}
strng1++;
@ -2445,7 +2442,7 @@ int noverify;
if ((text_changes) && (!noverify))
{
ans = get_string(changes_made_prompt, TRUE);
if (toupper(*ans) == toupper(*yes_char))
if (toupper((unsigned char)*ans) == toupper((unsigned char)*yes_char))
text_changes = FALSE;
else
return(0);
@ -2522,7 +2519,7 @@ int warn_if_exists;
if ((temp_fp = fopen(file_name, "r")))
{
tmp_point = get_string(file_exists_prompt, TRUE);
if (toupper(*tmp_point) == toupper(*yes_char))
if (toupper((unsigned char)*tmp_point) == toupper((unsigned char)*yes_char))
write_flag = TRUE;
else
write_flag = FALSE;
@ -3437,14 +3434,13 @@ struct menu_entries menu_list[];
if (input == -1)
exit(0);
if (((tolower(input) >= 'a') && (tolower(input) <= 'z')) ||
((input >= '0') && (input <= '9')))
if (isascii(input) && isalnum(input))
{
if ((tolower(input) >= 'a') && (tolower(input) <= 'z'))
if (isalpha(input))
{
temp = 1 + tolower(input) - 'a';
}
else if ((input >= '0') && (input <= '9'))
else if (isdigit(input))
{
temp = (2 + 'z' - 'a') + (input - '0');
}