[libc,cmds] Fix isprint and kilo for CP 437 display

ghaerr · Oct 8, 2023 · 7eed859 · 7eed859
1 parent cecca16
commit 7eed859
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/elkscmd/misc_utils/kilo.c b/elkscmd/misc_utils/kilo.c
@@ -680,7 +680,7 @@ void editorQueryString(char* prompt, char *buffer){
 		} else if(c == ENTER) {
             editorSetStatusMessage("");
 			return;
-		} else if(isprint(c)) {
+		} else if(isprint(c & 255)) {
 			buffer[len++] = c;
 			buffer[len] = '\0';
 		}
@@ -870,7 +870,7 @@ int editorUpdateSyntax(erow *row) {
         }
 
         /* Handle non printable chars. */
-        if (!isprint(*p)) {
+        if (!isprint(*p & 255)) {
             row->hl[i] = HL_NONPRINT;
             p++; i++;
             prev_sep = 0;
@@ -987,7 +987,7 @@ int editorUpdateRow(erow *row) {
         if (row->chars[j] == TAB) {
             row->render[idx++] = ' ';
             while((idx+1) % TABSPACE != 0) row->render[idx++] = ' ';
-        } else if (!isprint(row->chars[j])) {
+        } else if (!isprint(row->chars[j] & 255)) {
             row->render[idx++] = '?';
         } else {
             row->render[idx++] = row->chars[j];
@@ -1715,7 +1715,7 @@ void editorFind(int fd, int mode) {
 			  find_next = 1;
             }
 
-        } else if (isprint(c)) {
+        } else if (isprint(c & 255)) {
             if (qlen < KILO_QUERY_LEN) {
                 query[qlen++] = c;
                 query[qlen] = '\0';

diff --git a/libc/ctype/isprint.c b/libc/ctype/isprint.c
@@ -1,6 +1,8 @@
 #include <ctype.h>
+#include <stdio.h>
 
 int isprint(int c)
 {
-	return (c & 0x7f) >= 32 && c < 127;
+    if (c == EOF) return 0;
+    return (c & 0xff) >= 32;    /* display ASCII and upper half of CP 437 */
 }