Fix return type of fgetwc

It returns wint_t, not wchar_t. This bug was fixed by Github user olehjalmar, I just applied the patch: deadpixi#118
japanoise · Sep 9, 2023 · ef0a4cc · ef0a4cc
1 parent 674a579
commit ef0a4cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sam/cmd.c b/sam/cmd.c
@@ -109,8 +109,9 @@ inputc(void)
             terminp = termoutp = termline;
     } else{
         int olderr = errno;
-        r = fgetwc(stdin);
-        if (r == WEOF && errno == EILSEQ){
+        wint_t err;
+        r = err = fgetwc(stdin);
+        if (err = WEOF && errno == EILSEQ){
             clearerr(stdin);
             fflush(stdin);
             fgetc(stdin);

diff --git a/sam/io.c b/sam/io.c
@@ -90,8 +90,9 @@ readio(File *f, bool *nulls, bool setdate)
 
     wchar_t buf[2] = {0};
     while (true){
-        buf[0] = fgetwc(io);
-        if (buf[0] == WEOF){
+        wint_t err;
+        buf[0] = err = fgetwc(io);
+        if (err == WEOF){
             if (errno == EILSEQ){
                 clearerr(io);
                 fflush(io);