X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Flib%2Fctype.h;h=9096aca4dbc7f0cded660d624dd364b831cdbfc5;hb=53641f9bb07aa127b2b5e402e28b7421ce8a7f3b;hp=fafa51fdba6cb8b6084a7a25cf27879d2e9fc75c;hpb=f2f8875638593bd5365cfd6a5ba7c9578e52322f;p=pintos-anon

diff --git a/src/lib/ctype.h b/src/lib/ctype.h
index fafa51f..9096aca 100644
--- a/src/lib/ctype.h
+++ b/src/lib/ctype.h
@@ -1,5 +1,5 @@
-#ifndef LIB_CTYPE_H
-#define LIB_CTYPE_H 1
+#ifndef __LIB_CTYPE_H
+#define __LIB_CTYPE_H
 
 static inline int islower (int c) { return c >= 'a' && c <= 'z'; }
 static inline int isupper (int c) { return c >= 'A' && c <= 'Z'; }
@@ -13,12 +13,16 @@ static inline int isspace (int c) {
   return (c == ' ' || c == '\f' || c == '\n'
           || c == '\r' || c == '\t' || c == '\v');
 }
-static inline int isgraph (int c) { return c >= 33 && c < 127; }
+static inline int isblank (int c) { return c == ' ' || c == '\t'; }
+static inline int isgraph (int c) { return c > 32 && c < 127; }
 static inline int isprint (int c) { return c >= 32 && c < 127; }
-static inline int iscntrl (int c) { return c >= 0 && c < 32; }
+static inline int iscntrl (int c) { return (c >= 0 && c < 32) || c == 127; }
 static inline int isascii (int c) { return c >= 0 && c < 128; }
 static inline int ispunct (int c) {
   return isprint (c) && !isalnum (c) && !isspace (c);
 }
 
+static inline int tolower (int c) { return isupper (c) ? c - 'A' + 'a' : c; }
+static inline int toupper (int c) { return islower (c) ? c - 'a' + 'A' : c; }
+
 #endif /* lib/ctype.h */