Changeset ed88c8e in mainline for uspace/lib/c

Timestamp:

2018-05-29T13:25:07Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fc0b2a8

Parents:

a57fa32

git-author:

Jiri Svoboda <jiri@…> (2018-05-28 17:24:17)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-29 13:25:07)

Message:

fputc, putchar vs. fputwc, putwchar.

Location:

uspace/lib/c

Files:

• generic/io/chargrid.c (modified) (3 diffs)
• generic/io/io.c (modified) (2 diffs)
• generic/io/vprintf.c (modified) (1 diff)
• include/io/chargrid.h (modified) (1 diff)
• include/stdio.h (modified) (2 diffs)
• include/wchar.h (modified) (1 diff)

uspace/lib/c/generic/io/chargrid.c

@@ -140 +140 @@
  *
  */
-sysarg_t chargrid_putchar(chargrid_t *scrbuf, wchar_t ch, bool update)
+sysarg_t chargrid_putwchar(chargrid_t *scrbuf, wchar_t ch, bool update)
 {
         assert(scrbuf->col < scrbuf->cols);
@@ -199 +199 @@
 
         for (sysarg_t i = 0; i < spaces; i++)
-                flush += chargrid_putchar(scrbuf, ' ', true) - 1;
+                flush += chargrid_putwchar(scrbuf, ' ', true) - 1;
 
         return flush;
@@ -228 +228 @@
                 scrbuf->row--;
 
-                chargrid_putchar(scrbuf, ' ', false);
+                chargrid_putwchar(scrbuf, ' ', false);
                 return 2;
         }
 
         scrbuf->col--;
-        chargrid_putchar(scrbuf, ' ', false);
+        chargrid_putwchar(scrbuf, ' ', false);
         return 1;
 }

uspace/lib/c/generic/io/io.c

@@ -46 +46 @@
 #include <ipc/loc.h>
 #include <adt/list.h>
+#include <wchar.h>
 #include "../private/io.h"
 #include "../private/stdio.h"
@@ -702 +703 @@
 }
 
-int fputc(wchar_t c, FILE *stream)
+wint_t fputwc(wchar_t wc, FILE *stream)
 {
         char buf[STR_BOUNDS(1)];
         size_t sz = 0;
 
-        if (chr_encode(c, buf, &sz, STR_BOUNDS(1)) == EOK) {
-                size_t wr = fwrite(buf, 1, sz, stream);
-
-                if (wr < sz)
-                        return EOF;
-
-                return (int) c;
-        }
-
-        return EOF;
-}
-
-int putchar(wchar_t c)
+        if (chr_encode(wc, buf, &sz, STR_BOUNDS(1)) != EOK) {
+                errno = EILSEQ;
+                return WEOF;
+        }
+
+        size_t wr = fwrite(buf, 1, sz, stream);
+        if (wr < sz)
+                return WEOF;
+
+        return wc;
+}
+
+wint_t putwchar(wchar_t wc)
+{
+        return fputwc(wc, stdout);
+}
+
+int fputc(int c, FILE *stream)
+{
+        unsigned char b;
+        size_t wr;
+
+        b = (unsigned char) c;
+        wr = fwrite(&b, sizeof(b), 1, stream);
+        if (wr < 1)
+                return EOF;
+
+        return b;
+}
+
+int putchar(int c)
 {
         return fputc(c, stdout);

uspace/lib/c/generic/io/vprintf.c

@@ -54 +54 @@
 
         while (offset < size) {
-                if (fputc(str[chars], (FILE *) stream) <= 0)
+                if (fputwc(str[chars], (FILE *) stream) <= 0)
                         break;
 

uspace/lib/c/include/io/chargrid.h

@@ -79 +79 @@
 extern sysarg_t chargrid_get_top_row(chargrid_t *);
 
-extern sysarg_t chargrid_putchar(chargrid_t *, wchar_t, bool);
+extern sysarg_t chargrid_putwchar(chargrid_t *, wchar_t, bool);
 extern sysarg_t chargrid_newline(chargrid_t *);
 extern sysarg_t chargrid_tabstop(chargrid_t *, sysarg_t);

uspace/lib/c/include/stdio.h

@@ -40 +40 @@
 #include <_bits/size_t.h>
 #include <_bits/wchar_t.h>
+#include <_bits/wint_t.h>
 
 #define EOF  (-1)
@@ -73 +74 @@
 
 /* Character and string output functions */
-extern int fputc(wchar_t, FILE *);
+extern int fputc(int, FILE *);
 extern int fputs(const char *, FILE *);
 
-// FIXME: putchar and fputc are byte-oriented.
-// They shouldn't accept wide characters.
-extern int putchar(wchar_t);
+extern int putchar(int);
 extern int puts(const char *);
 
 extern int ungetc(int, FILE *);
+
+extern wint_t fputwc(wchar_t, FILE *);
+extern wint_t putwchar(wchar_t);
 
 /* Formatted string output functions */

uspace/lib/c/include/wchar.h

@@ -44 +44 @@
 #include <_bits/wchar_t.h>
 #include <_bits/wint_t.h>
+#include <_bits/WEOF.h>
 
 #include <_bits/NULL.h>