From f90445e947b746844435834acdaa13736e2cc55a Mon Sep 17 00:00:00 2001
From: orbitcowboy <ettl.martin78@gmail.com>
Date: Mon, 23 Jun 2014 14:15:47 +0200
Subject: [PATCH] Extended std.cfg and avr.cfg about more functions.

---
 cfg/avr.cfg | 60 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 cfg/std.cfg | 31 ++++++++++++++++++++++++---
 2 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/cfg/avr.cfg b/cfg/avr.cfg
index 430f0d739..85b585f8f 100644
--- a/cfg/avr.cfg
+++ b/cfg/avr.cfg
@@ -21,7 +21,11 @@
   <podtype name="intmax_t" sign="s" size="8"/>
   <podtype name="uintmax_t" sign="u" size="8"/>
   <!-- ctype.h -->
-  <function name="toascii"> <noreturn>false</noreturn> <leak-ignore/> <arg nr="1"><valid>0:255</valid></arg> </function>
+  <function name="toascii">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <arg nr="1"><valid>0:255</valid></arg>
+  </function>
   <!-- errno.h -->
   <define name="EDOM" value="33"/>
   <define name="ERANGE" value="34"/>
@@ -147,26 +151,72 @@
 	  <formatstr/> <arg nr="1"><formatstr/></arg>
 	  <arg nr="any"><not-uninit/></arg>
   </function>
-  <function name="sprintf_P"> 
+  <function name="sprintf_P">
 	   <noreturn>false</noreturn>
 	   <leak-ignore/>
 	   <formatstr/> <arg nr="2"><formatstr/></arg>
+	   <arg nr="any"><not-uninit/></arg>
    </function>
   <function name="snprintf_P">
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
 	  <formatstr/> <arg nr="3"><formatstr/></arg>
+	  <arg nr="any"><not-uninit/></arg>
    </function>
   <function name="vsprintf_P">
 	 <noreturn>false</noreturn>
 	 <leak-ignore/>
 	 <formatstr/>  <arg nr="2"><formatstr/></arg>
-  </function> 
+	 <arg nr="any"><not-uninit/></arg>	
+  </function>
   <function name="vsnprintf_P">
 	  <noreturn>false</noreturn>
 	  <leak-ignore/>
-	  <formatstr/>  <arg nr="3"><formatstr/></arg>
-  </function>    
+	  <formatstr/><arg nr="3"><formatstr/></arg>
+	  <arg nr="any"><not-uninit/></arg>
+  </function>
+  <function name="fprintf_P">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <arg nr="1"><not-null/><not-uninit/></arg>
+	  <formatstr/><arg nr="2"><formatstr/></arg>
+	  <arg nr="any"><not-uninit/></arg>
+  </function>
+  <function name="fputs_P">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/></arg>
+       <arg nr="2"><not-null/><not-uninit/></arg>
+  </function>
+  <function name="puts_P">
+       <noreturn>false</noreturn>
+       <leak-ignore/>
+       <arg nr="1"><not-null/><not-uninit/><not-bool/><valid>0:</valid></arg>
+  </function>
+  <function name="scanf_P">
+	  <noreturn>false</noreturn>
+      <leak-ignore/>
+	  <arg nr="1"><not-uninit/></arg>
+	  <formatstr scan="true"/><arg nr="2"><formatstr/></arg>
+	  <arg nr="any"><not-uninit/></arg>
+  </function>
+  <function name="fscanf_P">
+	  <noreturn>false</noreturn>
+      <leak-ignore/>
+	  <arg nr="1"><not-uninit/></arg>
+	  <formatstr scan="true"/><arg nr="2"><formatstr/></arg>
+	  <arg nr="any"><not-uninit/></arg>
+  </function>
+  <function name="sscanf_P">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg>
+  </function>
+  <function name="fdevopen">
+	  <noreturn>false</noreturn>
+	  <arg nr="1"><not-null/><not-uninit/></arg>
+	  <arg nr="2"><not-null/><not-uninit/></arg>
+  </function> 
   <!-- stdlib.h -->
   <define name="__ptr_t" value="void *"/>
   <define name="RAND_MAX" value="0x7FFF"/>
diff --git a/cfg/std.cfg b/cfg/std.cfg
index fc3c3667f..ceae8269f 100644
--- a/cfg/std.cfg
+++ b/cfg/std.cfg
@@ -79,6 +79,12 @@
 	  <arg nr="1"><not-uninit/></arg>
 	  <formatstr scan="true"/><arg nr="2"><formatstr/></arg>
   </function>
+  <function name="vfscanf">
+	  <noreturn>false</noreturn>
+      <leak-ignore/>
+	  <arg nr="1"><not-uninit/></arg>
+	  <formatstr scan="true"/><arg nr="2"><formatstr/></arg>
+  </function>
   <function name="fseek">
         <noreturn>false</noreturn>
         <leak-ignore/>
@@ -113,6 +119,12 @@
         <arg nr="4"><not-null/><not-uninit/></arg>
   </function>
   <function name="getc"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
+  <function name="ungetc">
+		<noreturn>false</noreturn>
+		<leak-ignore/>
+		<arg nr="1"><not-uninit/></arg>
+		<arg nr="1"><not-null/><not-uninit/></arg>
+  </function>
   <function name="getenv"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
   <function name="gets"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/></arg></function>
   <function name="gmtime"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
@@ -239,7 +251,16 @@
   </function>
   <function name="rewind"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
   <function name="round"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
-  <function name="scanf"><noreturn>false</noreturn> <formatstr scan="true"/>  <arg nr="1"><formatstr/></arg> </function>
+  <function name="scanf">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <formatstr scan="true"/><arg nr="1"><formatstr/></arg>
+  </function>
+  <function name="vscanf">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <formatstr scan="true"/><arg nr="1"><formatstr/></arg>
+  </function> 
   <function name="setbuf">
         <noreturn>false</noreturn>
         <leak-ignore/>
@@ -293,14 +314,18 @@
 
   <function name="wprintf">  <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="1"><formatstr/></arg> </function>
   <function name="sprintf">  <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
-  <function name="vsprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="2"><formatstr/></arg> </function> 
+  <function name="vsprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="fwprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="snprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="3"><formatstr/></arg> </function>
   <function name="vsnprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="3"><formatstr/></arg> </function>
   <function name="fnprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/>  <arg nr="3"><formatstr/></arg> </function>
 
   <function name="wscanf">   <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/>  <arg nr="1"><formatstr/></arg> </function>
-  <function name="sscanf">   <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
+  <function name="sscanf">
+	  <noreturn>false</noreturn>
+	  <leak-ignore/>
+	  <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg>
+  </function>
 
   <function name="fwscanf">  <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>
   <function name="swscanf">  <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/>  <arg nr="2"><formatstr/></arg> </function>