Merge branch 'master' of git://git.ucc.asn.au/tpg/acess2

[tpg/acess2.git] / Usermode / Libraries / libc.so_src / ctype.c

diff --git a/Usermode/Libraries/libc.so_src/ctype.c b/Usermode/Libraries/libc.so_src/ctype.c
index d5a5e97..18a199c 100644 (file)
--- a/Usermode/Libraries/libc.so_src/ctype.c
+++ b/Usermode/Libraries/libc.so_src/ctype.c
@@ -22,23 +22,40 @@ int isalnum(int ch) {
        return isalpha(ch) || isdigit(ch);
 }
 
-int toupper(int ch) {
-       if('a'<=ch && ch <='z')
-               return ch - 'a' + 'A';
-       return ch;
+int isxdigit(int ch) {
+       if('0'<=ch&&ch<='9')    return 1;
+       if('a'<=ch&&ch<='f')    return 1;
+       if('F'<=ch&&ch<='F')    return 1;
+       return 0;
 }
-int tolower(int ch) {
-       if('A'<=ch && ch <='Z')
-               return ch - 'A' + 'a';
-       return ch;
+
+int isupper(int ch) {
+       if('A'<=ch && ch <='Z') return 1;
+       return 0;
+}
+
+int islower(int ch) {
+       if('a'<=ch && ch <='z') return 1;
+       return 0;
+}
+
+int ispunct(int ch) {
+       if( isprint(ch) && !isspace(ch) && !isalnum(ch) )
+               return 1;
+       return 0;
 }
 
 int isprint(int ch ) {
-       if( ch < ' ' )  return 0;
-       if( ch > 'z' )  return 0;
+       if( ' ' <= ch && ch <= 'z' )    return 1;
        return 1;
 }
 
+int isgraph(int ch) {
+       // Anything but space
+       if( ' ' < ch && ch <= 'z' )     return 1;
+       return 0;
+}
+
 int isspace(int ch) {
        if(ch == ' ')   return 1;
        if(ch == '\t')  return 1;
@@ -47,12 +64,17 @@ int isspace(int ch) {
        return 0;
 }
 
-int isxdigit(int ch) {
-       if('0'<=ch&&ch<='9')    return 1;
-       if('a'<=ch&&ch<='f')    return 1;
-       if('F'<=ch&&ch<='F')    return 1;
-       return 0;
+int toupper(int ch) {
+       if('a'<=ch && ch <='z')
+               return ch - 'a' + 'A';
+       return ch;
 }
+int tolower(int ch) {
+       if('A'<=ch && ch <='Z')
+               return ch - 'A' + 'a';
+       return ch;
+}
+
 
 // C99
 int isblank(int ch) {