Changeset 2062

Timestamp:

Jun 23, 2005, 8:01:58 AM (20 years ago)

Author:

bird

Message:

wide support.

File:

• trunk/src/emx/src/lib/io/_output.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/io/_output.c

@@ -13 +13 @@
 #include <emx/float.h>
 #include <InnoTekLIBC/locale.h>
+#include <wchar.h>
 #include "getputc.h"
 
@@ -175 +176 @@
     OUT_PAD (v, ' ', v->width - str_len);
   OUT_STR (v, str, str_len);
+  if (str_len < v->width && v->minus)
+    OUT_PAD (v, ' ', v->width - str_len);
+  return 0;
+}
+
+
+/* Perform formatting for the "%C" and "%S" formats.  The meaning of
+   the '0' flag is not defined by ANSI for "%C" and "%S"; we always
+   use blanks for padding. */
+
+static int cvt_wstr (olocal *v, const wchar_t *str, int str_len)
+{
+  if (str == NULL)
+    {
+      /* Print "(null)" for the NULL pointer if the precision is big
+         enough or not specified. */
+
+      if (v->prec < 0 || v->prec >= 6)
+        str = L"(null)";
+      else
+        str = L"";
+    }
+
+  /* The precision, if specified, limits the number of characters to
+     be printed.  If the precision is specified, the array pointed to
+     by STR does not need to be null-terminated. */
+
+  if (str_len == -1)
+    {
+      if (v->prec >= 0)
+        {
+          const wchar_t *end = (const wchar_t *)wmemchr (str, 0, v->prec);
+          if (end != NULL)
+            str_len =  end - str;
+          else
+            str_len = v->prec;
+        }
+      else
+        str_len = wcslen (str);
+    }
+  else if (v->prec >= 0 && v->prec < str_len)
+    str_len = v->prec;
+
+  /* Print the string, using blanks for padding. */
+
+  if (str_len < v->width && !v->minus)
+    OUT_PAD (v, ' ', v->width - str_len);
+  mbstate_t state = {{0}};
+  for (int i = 0; i < str_len; i++)
+  {
+      char mb[MB_LEN_MAX + 1];
+      size_t cb = wcrtomb(mb, *str, &state);
+      switch (cb)
+      {
+          /*
+           * Quit the loop.
+           */
+          case -2: /* incomplete character - we ASSUME this cannot happen. */
+          case -1: /* encoding error */
+          case 0:  /* end of string */
+              i = str_len;
+              break;
+
+          default:
+              str++;
+              OUT_STR(v, mb, cb);
+              break;
+      }
+  }
   if (str_len < v->width && v->minus)
     OUT_PAD (v, ' ', v->width - str_len);
@@ -872 +942 @@
 
           case 'c':
+            if (size != 'l' && size != 'L')
+              {
+                char c;
+
+                c = (char)va_arg (arg_ptr, int);
+                v.prec = 1;
+                CHECK (cvt_str (&v, &c, 1));
+                break;
+              }
+            /* fall thru */
+          case 'C':
             {
-              char c;
-
-              c = (char)va_arg (arg_ptr, int);
+              wchar_t wc;
+
+              wc = (wchar_t)va_arg (arg_ptr, int);
               v.prec = 1;
-              CHECK (cvt_str (&v, &c, 1));
+              CHECK (cvt_wstr (&v, &wc, 1));
             }
             break;
 
           case 's':
-            CHECK (cvt_str (&v, va_arg (arg_ptr, const char *), -1));
+            if (size != 'l' && size != 'L')
+              {
+                CHECK (cvt_str (&v, va_arg (arg_ptr, const char *), -1));
+                break;
+              }
+            /* fall thru */
+          case 'S':
+            CHECK (cvt_wstr (&v, va_arg (arg_ptr, const wchar_t *), -1));
             break;