From 42397ee8cb8b7de370c993f2425f8b79219b59da Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Thu, 15 Jan 2015 23:14:10 +0100
Subject: [PATCH] std.cfg: Improved support for <cwchar> (wchar.h).

---
 cfg/std.cfg | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/cfg/std.cfg b/cfg/std.cfg
index f105bdc70..32485fefa 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -1074,6 +1074,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wint_t fgetwc (FILE * stream); -->
   <function name="fgetwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1326,6 +1327,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wint_t fputwc (wchar_t wc, FILE * stream); -->
   <function name="fputwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1350,6 +1352,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- int fputws (const wchar_t* ws, FILE* stream); -->
   <function name="fputws">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1531,6 +1534,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wchar_t* fgetws (wchar_t* ws, int num, FILE* stream); -->
   <function name="fgetws">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1556,6 +1560,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- int fwide (FILE* stream, int mode); -->
   <function name="fwide">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1607,6 +1612,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- size_t mbrlen (const char* pmb, size_t max, mbstate_t* ps); -->
   <function name="mbrlen">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1632,6 +1638,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- int mbsinit (const mbstate_t* ps);  -->
   <function name="mbsinit">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1639,6 +1646,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wint_t getwchar (void); -->
   <function name="getwchar">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1654,6 +1662,21 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- size_t mbsrtowcs (wchar_t* dest, const char** src, size_t max, mbstate_t* ps); -->
+  <function name="mbsrtowcs">
+    <noreturn>false</noreturn>
+    <leak-ignore/>
+    <arg nr="2">
+      <not-null/>
+      <not-uninit/>
+    </arg>
+    <arg nr="3">
+      <not-uninit/>
+    </arg>
+    <arg nr="4">
+      <not-null/>
+    </arg>
+  </function>
   <function name="wctomb">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -1683,6 +1706,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wint_t getwc (FILE* stream); -->
   <function name="getwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -3141,12 +3165,12 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- wint_t putwc (wchar_t wc, FILE* stream); -->
   <function name="putwc">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
-      <not-bool/>
     </arg>
     <arg nr="2">
       <not-null/>
@@ -3162,13 +3186,12 @@
       <valid>0:</valid>
     </arg>
   </function>
+  <!-- wint_t putwchar (wchar_t wc); -->
   <function name="putwchar">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <arg nr="1">
       <not-uninit/>
-      <not-bool/>
-      <valid>0:</valid>
     </arg>
   </function>
   <function name="puts">
@@ -4010,6 +4033,7 @@
       <not-uninit/>
     </arg>
   </function>
+  <!-- size_t mbrtowc (wchar_t* pwc, const char* pmb, size_t max, mbstate_t* ps); -->
   <function name="mbrtowc">
     <noreturn>false</noreturn>
     <leak-ignore/>
@@ -4107,11 +4131,16 @@
       <formatstr/>
     </arg>
   </function>
+  <!-- int fwprintf (FILE* stream, const wchar_t* format, ...); -->
   <function name="fwprintf">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <formatstr/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
     <arg nr="2">
+      <not-null/>
       <formatstr/>
     </arg>
   </function>
@@ -4155,11 +4184,16 @@
       <formatstr/>
     </arg>
   </function>
+  <!-- int fwscanf (FILE* stream, const wchar_t* format, ...); -->
   <function name="fwscanf">
     <noreturn>false</noreturn>
     <leak-ignore/>
     <formatstr scan="true"/>
+    <arg nr="1">
+      <not-null/>
+    </arg>
     <arg nr="2">
+      <not-null/>
       <formatstr/>
     </arg>
   </function>