From ca3b91855ac2de392c1f0b08ed40f40c4f49d27e Mon Sep 17 00:00:00 2001
From: dumganhar <dumganhar@163.com>
Date: Thu, 10 Nov 2011 16:44:58 +0800
Subject: [PATCH] debug issue #852

---
 HelloWorld/bada/sdk2.0/.cproject             |   12 +-
 cocos2dx/include/ccConfig.h                  |    4 +-
 cocos2dx/platform/CCPlatformMacros.h         |   26 +-
 cocos2dx/platform/bada/CCPlatformFunc_bada.c | 1350 ------------------
 cocos2dx/platform/bada/CCPlatformFunc_bada.h |    6 +
 cocos2dx/textures/CCTextureAtlas.cpp         |   21 +-
 tests/test.bada/sdk2.0/.cproject             |   12 +-
 7 files changed, 56 insertions(+), 1375 deletions(-)
 delete mode 100644 cocos2dx/platform/bada/CCPlatformFunc_bada.c

diff --git a/HelloWorld/bada/sdk2.0/.cproject b/HelloWorld/bada/sdk2.0/.cproject
index 24b167207f..a78ecb1809 100644
--- a/HelloWorld/bada/sdk2.0/.cproject
+++ b/HelloWorld/bada/sdk2.0/.cproject
@@ -24,7 +24,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
+				<configuration artifactExtension="exe" artifactName="HelloWorld" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd.. &amp; (if not exist Res mkdir Res) &amp; (copy /y ..\..\Resource\*.* Res)">
 					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.debug.2113673682." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug.2127488964" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug.1117105675" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug"/>
@@ -53,10 +53,7 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.c.linker.exe.debug.1406585521" name="bada C Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.c.linker.exe.debug"/>
 							<tool id="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug.1747969474" name="bada C++ Linker" superClass="cdt.managedbuild.tool.osp.gnu.target.cpp.linker.exe.debug">
-								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.2056672880" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="cocos2dx"/>
-									<listOptionValue builtIn="false" value="CocosDenshion"/>
-								</option>
+								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.2056672880" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs"/>
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.paths.1078498225" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${SDKROOT}/Tools/Toolchains/ARM/arm-samsung-nucleuseabi/lib&quot;"/>
@@ -65,8 +62,13 @@
 								</option>
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.userobjs.807623096" name="Other objects" superClass="osp.gnu.target.cpp.link.debug.exe.option.userobjs" valueType="userObjs">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.bada/sdk2.0_StaticLib/.Target-Debug/libcocos2dx.a"/>
+									<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.bada/sdk2.0_StaticLib/.Target-Debug/libCocosDenshion.a"/>
 									<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk2.0/.Target-Debug/libBox2D.a"/>
 									<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk2.0/.Target-Debug/libchipmunk.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.Target-Debug/libjpeg.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/png/sdk2.0/.Target-Debug/libpng.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.Target-Debug/libzlib.a"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsOpengl.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsEgl.so&quot;"/>
diff --git a/cocos2dx/include/ccConfig.h b/cocos2dx/include/ccConfig.h
index 5461c6903d..4c317d856b 100755
--- a/cocos2dx/include/ccConfig.h
+++ b/cocos2dx/include/ccConfig.h
@@ -281,7 +281,7 @@ Useful for debugging purposes only. It is recommened to leave it disabled.
 To enable set it to a value different than 0. Disabled by default.
 */
 #ifndef CC_SPRITEBATCHNODE_DEBUG_DRAW
-#define CC_SPRITEBATCHNODE_DEBUG_DRAW 0
+#define CC_SPRITEBATCHNODE_DEBUG_DRAW 1
 #endif
 
 /** @def CC_LABELBMFONT_DEBUG_DRAW
@@ -291,7 +291,7 @@ Useful for debugging purposes only. It is recommened to leave it disabled.
 To enable set it to a value different than 0. Disabled by default.
 */
 #ifndef CC_LABELBMFONT_DEBUG_DRAW
-#define CC_LABELBMFONT_DEBUG_DRAW 0
+#define CC_LABELBMFONT_DEBUG_DRAW 1
 #endif
 
 /** @def CC_LABELATLAS_DEBUG_DRAW
diff --git a/cocos2dx/platform/CCPlatformMacros.h b/cocos2dx/platform/CCPlatformMacros.h
index 47713dbff4..b44a1b9c1f 100644
--- a/cocos2dx/platform/CCPlatformMacros.h
+++ b/cocos2dx/platform/CCPlatformMacros.h
@@ -161,8 +161,22 @@ public: inline void set##funName(const varType& var){ varName = var; }
 #include <assert.h>
 #define CC_ASSERT(cond)                assert(cond)
 #else
-#define CC_ASSERT(cond)
+// bada platform
+#include <FBaseConfig.h>
+#include <FBaseSys.h>
+
+#undef CC_DLL
+#define CC_DLL  _EXPORT_
+
+#include "CCPlatformFunc_bada.h"
+
+#ifdef _DEBUG
+#define CC_ASSERT(cond)                if (!(cond)) badaAssert(__PRETTY_FUNCTION__ , __LINE__ , #cond)
+#else
+#define CC_ASSERT(cond) 
+#endif /* _DEBUG */
 #endif
+
 #define CC_UNUSED_PARAM(unusedparam)   (void)unusedparam
 
 #if (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
@@ -195,14 +209,4 @@ public: inline void set##funName(const varType& var){ varName = var; }
 
 #endif  // wophone VM
 
-#if (CC_TARGET_PLATFORM == CC_PLATFORM_BADA)
-#include <FBaseConfig.h>
-#undef CC_DLL
-#define CC_DLL  _EXPORT_
-
-#ifndef CC_BADA_2_0
-#include "CCPlatformFunc_bada.h"
-#endif
-#endif
-
 #endif // __CC_PLATFORM_MACROS_H__
diff --git a/cocos2dx/platform/bada/CCPlatformFunc_bada.c b/cocos2dx/platform/bada/CCPlatformFunc_bada.c
deleted file mode 100644
index 20a3775abb..0000000000
--- a/cocos2dx/platform/bada/CCPlatformFunc_bada.c
+++ /dev/null
@@ -1,1350 +0,0 @@
-#include "CCPlatformFunc_bada.h"
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <limits.h>
-#include <malloc.h>
-#include <errno.h>
-#undef errno
-
-static int errno = 0;
-
-#define	_U	01
-#define	_L	02
-#define	_N	04
-#define	_S	010
-#define _P	020
-#define _C	040
-#define _X	0100
-#define	_B	0200
-
-#define _CTYPE_DATA_0_127 \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_C,	_C|_S, _C|_S, _C|_S,	_C|_S,	_C|_S,	_C,	_C, \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_C,	_C,	_C,	_C,	_C,	_C,	_C,	_C, \
-	_S|_B,	_P,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_P,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_N,	_N,	_N,	_N,	_N,	_N,	_N,	_N, \
-	_N,	_N,	_P,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U|_X,	_U, \
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, \
-	_U,	_U,	_U,	_U,	_U,	_U,	_U,	_U, \
-	_U,	_U,	_U,	_P,	_P,	_P,	_P,	_P, \
-	_P,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L|_X,	_L, \
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, \
-	_L,	_L,	_L,	_L,	_L,	_L,	_L,	_L, \
-	_L,	_L,	_L,	_P,	_P,	_P,	_P,	_C
-
-#define _CTYPE_DATA_128_255 \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0, \
-	0,	0,	0,	0,	0,	0,	0,	0
-
-char _ctype_b[128 + 256] = {
-    _CTYPE_DATA_128_255,
-    _CTYPE_DATA_0_127,
-    _CTYPE_DATA_128_255
-};
-
-
-char *__ctype_ptr__ = (char *) _ctype_b + 127;
-
-
-int sprintf(char* buf, const char *format, ...)
-{
-	va_list ap;
-
-	va_start(ap, format);
-
-	char szBuf[256] = {0};
-
-	int n = vsnprintf(szBuf, 256, format, ap);
-	va_end(ap) ;
-
-	strcpy(buf, szBuf);
-
-//	AppLog(buf);
-
-	return n;
-}
-
-/* The internal entry points for `strtoX' take an extra flag argument
-   saying whether or not to parse locale-dependent number grouping.  */
-
-double __strtod_internal  (const char *__nptr,char **__endptr, int __group);
-float __strtof_internal (const char *__nptr, char **__endptr,int __group);
-long double __strtold_internal  (const char *__nptr,char **__endptr, int __group);
-long int __strtol_internal (const char *__nptr, char **__endptr,	int __base, int __group);
-unsigned long int __strtoul_internal  (const char *__nptr,  char **__endptr, int __base, int __group);
-
-
-#ifdef	__GNUC__
-#define	HAVE_LONGLONG
-#define	MLONGLONG	long long
-#else
-#define	MLONGLONG	long
-#endif
-
-/* Those are flags in the conversion format. */
-# define MLONG		0x001	/* l: long or double */
-# define MLONGDBL	0x002	/* L: long long or long double */
-# define MSHORT		0x004	/* h: short */
-# define MSUPPRESS	0x008	/* *: suppress assignment */
-# define MPOINTER	0x010	/* weird %p pointer (`fake hex') */
-# define MNOSKIP		0x020	/* do not skip blanks */
-# define MWIDTH		0x040	/* width was given */
-# define MGROUP		0x080	/* ': group numbers */
-# define MMALLOC		0x100	/* a: malloc strings */
-
-#define TYPEMOD	(MLONG|MLONGDBL|MSHORT)
-#define _IOREAD         0x0001
-
-typedef struct _myiobuf {
-	char *_ptr;
-	int   _cnt;
-	char *_base;
-	int   _flag;
-	int   _file;
-	int   _charbuf;
-	int   _bufsiz;
-	char *_tmpfname;
-}MYFILE;
-
-int my_getc(MYFILE *fp)
-{
-	int c = -1;
-	// check for invalid stream
-
-// 	if ( !__validfp (fp) ) {
-// 		__set_errno(EINVAL);
-// 		return EOF;
-// 	}
-	// check for read access on stream
-
-// 	if ( !OPEN4READING(fp) ) {
-// 		__set_errno(EINVAL);
-// 		return -1;
-// 	}
-
-	if(fp->_cnt > 0) {
-		fp->_cnt--;
-		c =  (int)*fp->_ptr++;
-	}
-// 	else {
-// 		c =  _filbuf(fp);
-// 	}
-	return c;
-}
-
-int
-sys_ungetc(int c, MYFILE *f)
-{
-
-// 	if (!__validfp (f) || !OPEN4READING(f)) {
-// 		__set_errno (EINVAL);
-// 		return EOF;
-// 	}
-
-	if (c == EOF )
-		return EOF;
-
-
-
-	if ( f->_ptr == NULL || f->_base == NULL)
-		return EOF;
-
-	if (f->_ptr == f->_base)
-	{
-		if (f->_cnt == 0)
-			f->_ptr++;
-		else
-			return EOF;
-	}
-
-	f->_cnt++;
-	f->_ptr--;
-	if(*f->_ptr != c)
-	{
-//		f->_flag |= _IOUNGETC;
-		*f->_ptr = c;
-	}
-	return c;
-}
-
-
-#define my_ungetc(c, s)	((void) (c != EOF && --read_in), sys_ungetc (c, s))
-#define inchar()	((c = my_getc (s)), (void) (c != EOF && ++read_in), c)
-#define encode_error()	do {						      \
-			  funlockfile (s);				      \
-			  /*__set_errno (EILSEQ);*/				      \
-			  return done;					      \
-			} while (0)
-#define conv_error()	do {						      \
-			  funlockfile (s);				      \
-			  return done;					      \
-			} while (0)
-#define input_error()	do {						      \
-			  funlockfile (s);				      \
-			  return done ? 0 : EOF;				      \
-			} while (0)
-#define memory_error()	do {						      \
-			  funlockfile (s);				      \
-			  __set_errno (ENOMEM);				      \
-			  return EOF;					      \
-			} while (0)
-#define ARGCHECK(s, format)						      \
-  do									      \
-    {									      \
-      /* Check file argument for consistence.  */			      \
-      if (!__validfp (s) || !s->__mode.__read)				      \
-	{								      \
-	  __set_errno (EBADF);						      \
-	  return EOF;							      \
-	}								      \
-      else if (format == NULL)						      \
-	{								      \
-	  __set_errno (EINVAL);						      \
-	  return EOF;							      \
-	}								      \
-    } while (0)
-
-#define flockfile(S) /* nothing */
-#define funlockfile(S) /* nothing */
-
-  char *wp = NULL;		/* Workspace.  */
-  size_t wpmax = 0;		/* Maximal size of workspace.  */
-  size_t wpsize = 0;		/* Currently used bytes in workspace.  */
-
-
-void ADDW(int Ch)							    								        \
-{
-      if (wpsize == wpmax)
-  	{
-	  char *old = wp;
-	  wpmax = UCHAR_MAX > 2 * wpmax ? UCHAR_MAX : 2 * wpmax;
-	  wp = (char *) malloc (wpmax);
-	  if (old != NULL) {
-	    memcpy (wp, old, wpsize);
-	    free(old);
-	  }
-	}
-      wp[wpsize++] = (Ch);
-
-}
-
-
-int __vfscanf (MYFILE *s, const char *format, va_list argptr)
-{
-  va_list arg;
-  register const char *f = format;
-  register unsigned char fc;	/* Current character of the format.  */
-  register size_t done = 0;	/* Assignments done.  */
-  register size_t read_in = 0;	/* Chars read in.  */
-  register int c = 0;		/* Last char read.  */
-  register int width;		/* Maximum field width.  */
-  register int flags;		/* Modifiers for current format element.  */
-
-  /* Status for reading F-P nums.  */
-  char got_dot, got_e, negative;
-  /* If a [...] is a [^...].  */
-  char not_in;
-  /* Base for integral numbers.  */
-  int base;
-  /* Signedness for integral numbers.  */
-  int number_signed;
-  /* Decimal point character.  */
-  wchar_t decimal = '.';
-  /* The thousands character of the current locale.  */
-  wchar_t thousands = ',';
-  /* Integral holding variables.  */
-  union
-    {
-      long long int q;
-      unsigned long long int uq;
-      long int l;
-      unsigned long int ul;
-    } num;
-  /* Character-buffer pointer.  */
-  char *str = NULL;
-  wchar_t *wstr = NULL;
-  char **strptr = NULL;
-  size_t strsize = 0;
-  /* We must not react on white spaces immediately because they can
-     possibly be matched even if in the input stream no character is
-     available anymore.  */
-  int skip_space = 0;
-  /* Workspace.  */
-  char *tw;			/* Temporary pointer.  */
-
-#ifdef __va_copy
-  __va_copy (arg, argptr);
-#else
-  arg = (va_list) argptr;
-#endif
-
-
-
-  /* Run through the format string.  */
-  while (*f != '\0')
-    {
-      unsigned int argpos;
-      /* Extract the next argument, which is of type TYPE.
-	 For a %N$... spec, this is the Nth argument from the beginning;
-	 otherwise it is the next argument after the state now in ARG.  */
-#define ARG(type)	va_arg(argptr,type)
-
-      if (!isascii (*f))
-	{
-	  /* Non-ASCII, may be a multibyte.  */
-	 // int len = mblen (f, strlen (f));
-	int len =1;
-	  if (len > 0)
-	    {
-	      do
-		{
-		  c = inchar ();
-		  if (c == EOF)
-		    input_error ();
-		  else if (c != *f++)
-		    {
-		      my_ungetc (c, s);
-		      conv_error ();
-		    }
-		}
-	      while (--len > 0);
-	      continue;
-	    }
-	}
-
-      fc = *f++;
-      if (fc != '%')
-	{
-	  /* Remember to skip spaces.  */
-	  if (isspace (fc))
-	    {
-	      skip_space = 1;
-	      continue;
-	    }
-
-	  /* Read a character.  */
-	  c = inchar ();
-
-	  /* Characters other than format specs must just match.  */
-	  if (c == EOF)
-	    input_error ();
-
-	  /* We saw white space char as the last character in the format
-	     string.  Now it's time to skip all leading white space.  */
-	  if (skip_space)
-	    {
-	      while (isspace (c))
-		if (inchar () == EOF && errno == EINTR)
-		  conv_error ();
-	      skip_space = 0;
-	    }
-
-	  if (c != fc)
-	    {
-	      my_ungetc (c, s);
-	      conv_error ();
-	    }
-
-	  continue;
-	}
-
-      /* This is the start of the conversion string. */
-      flags = 0;
-
-      /* Initialize state of modifiers.  */
-      argpos = 0;
-
-      /* Prepare temporary buffer.  */
-      wpsize = 0;
-
-      /* Check for a positional parameter specification.  */
-      if (isdigit (*f))
-	{
-	  argpos = *f++ - '0';
-	  while (isdigit (*f))
-	    argpos = argpos * 10 + (*f++ - '0');
-	  if (*f == '$')
-	    ++f;
-	  else
-	    {
-	      /* Oops; that was actually the field width.  */
-	      width = argpos;
-	      flags |= MWIDTH;
-	      argpos = 0;
-	      goto got_width;
-	    }
-	}
-
-      /* Check for the assignment-suppressing and the number grouping flag.  */
-      while (*f == '*' || *f == '\'')
-	switch (*f++)
-	  {
-	  case '*':
-	    flags |= MSUPPRESS;
-	    break;
-	  case '\'':
-	    flags |= MGROUP;
-	    break;
-	  }
-
-      /* We have seen width. */
-      if (isdigit (*f))
-	flags |= MWIDTH;
-
-      /* Find the maximum field width.  */
-      width = 0;
-      while (isdigit (*f))
-	{
-	  width *= 10;
-	  width += *f++ - '0';
-	}
-    got_width:
-      if (width == 0)
-	width = -1;
-
-      /* Check for type modifiers.  */
-      while (*f == 'h' || *f == 'l' || *f == 'L' || *f == 'a' || *f == 'q')
-	switch (*f++)
-	  {
-	  case 'h':
-	    /* int's are short int's.  */
-	    if (flags & TYPEMOD)
-	      /* Signal illegal format element.  */
-	      conv_error ();
-	    flags |= MSHORT;
-	    break;
-	  case 'l':
-	    if (flags & (MSHORT|MLONGDBL))
-	      conv_error ();
-	    else if (flags & MLONG)
-	      {
-		/* A double `l' is equivalent to an `L'.  */
-		flags &= ~MLONG;
-		flags |= MLONGDBL;
-	      }
-	    else
-	      /* int's are long int's.  */
-	      flags |= MLONG;
-	    break;
-	  case 'q':
-	  case 'L':
-	    /* double's are long double's, and int's are long long int's.  */
-	    if (flags & TYPEMOD)
-	      /* Signal illegal format element.  */
-	      conv_error ();
-	    flags |= MLONGDBL;
-	    break;
-	  case 'a':
-	    if (flags & TYPEMOD)
-	      /* Signal illegal format element.  */
-	      conv_error ();
-	    /* String conversions (%s, %[) take a `char **'
-	       arg and fill it in with a malloc'd pointer.  */
-	    flags |= MMALLOC;
-	    break;
-	  }
-
-      /* End of the format string?  */
-      if (*f == '\0')
-	conv_error ();
-
-      /* We must take care for EINTR errors.  */
-      if (c == EOF && errno == EINTR)
-	input_error ();
-
-      /* Find the conversion specifier.  */
-      fc = *f++;
-      if (skip_space || (fc != '[' && fc != 'c' && fc != 'C' && fc != 'n'))
-	{
-	  /* Eat whitespace.  */
-	  do
-	    if (inchar () == EOF && errno == EINTR)
-	      input_error ();
-	  while (isspace (c));
-	  my_ungetc (c, s);
-	  skip_space = 0;
-	}
-
-      switch (fc)
-	{
-	case '%':	/* Must match a literal '%'.  */
-	  c = inchar ();
-	  if (c != fc)
-	    {
-	      my_ungetc (c, s);
-	      conv_error ();
-	    }
-	  break;
-
-	case 'n':	/* Answer number of assignments done.  */
-	  /* Corrigendum 1 to ISO C 1990 describes the allowed flags
-	     with the 'n' conversion specifier.  */
-	  if (!(flags & MSUPPRESS))
-	    {
-	      /* Don't count the read-ahead.  */
-	      if (flags & MLONGDBL)
-		*ARG (long int *) = read_in;
-	      else if (flags & MLONG)
-		*ARG (long int *) = read_in;
-	      else if (flags & MSHORT)
-		*ARG (short int *) = read_in;
-	      else
-		*ARG (int *) = read_in;
-
-#ifdef NO_BUG_IN_ISO_C_CORRIGENDUM_1
-	      /* We have a severe problem here.  The ISO C standard
-		 contradicts itself in explaining the effect of the %n
-		 format in `scanf'.  While in ISO C:1990 and the ISO C
-		 Amendement 1:1995 the result is described as
-
-		   Execution of a %n directive does not effect the
-		   assignment count returned at the completion of
-		   execution of the f(w)scanf function.
-
-		 in ISO C Corrigendum 1:1994 the following was added:
-
-		   Subclause 7.9.6.2
-		   Add the following fourth example:
-		     In:
-		       #include <stdio.h>
-		       int d1, d2, n1, n2, i;
-		       i = sscanf("123", "%d%n%n%d", &d1, &n1, &n2, &d2);
-		     the value 123 is assigned to d1 and the value3 to n1.
-		     Because %n can never get an input failure the value
-		     of 3 is also assigned to n2.  The value of d2 is not
-		     affected.  The value 3 is assigned to i.
-
-		 We go for now with the historically correct code fro ISO C,
-		 i.e., we don't count the %n assignments.  When it ever
-		 should proof to be wrong just remove the #ifdef above.  */
-	      ++done;
-#endif
-	    }
-	  break;
-
-	case 'c':	/* Match characters.  */
-	  if ((flags & MLONG) == 0)
-	    {
-	      if (!(flags & MSUPPRESS))
-		{
-		  str = ARG (char *);
-		  if (str == NULL)
-		    conv_error ();
-		}
-
-	      c = inchar ();
-	      if (c == EOF)
-		input_error ();
-
-	      if (width == -1)
-		width = 1;
-
-	      if (!(flags & MSUPPRESS))
-		{
-		  do
-		    *str++ = c;
-		  while (--width > 0 && inchar () != EOF);
-		}
-	      else
-		while (--width > 0 && inchar () != EOF);
-
-	      if (width > 0)
-		/* I.e., EOF was read.  */
-		--read_in;
-
-	      if (!(flags & MSUPPRESS))
-		++done;
-
-	      break;
-	    }
-	  /* FALLTHROUGH */
-	case 'C':
-	  /* Get UTF-8 encoded wide character.  Here we assume (as in
-	     other parts of the libc) that we only have to handle
-	     UTF-8.  */
-	  {
-	    wint_t val;
-	    size_t cnt = 0;
-	    int first = 1;
-
-	    if (!(flags & MSUPPRESS))
-	      {
-		wstr = ARG (wchar_t *);
-		if (str == NULL)
-		  conv_error ();
-	      }
-
-	    do
-	      {
-#define NEXT_WIDE_CHAR(First)						      \
-		c = inchar ();						      \
-		if (c == EOF)	{					      \
-		  /* EOF is only an error for the first character.  */	      \
-		  if (First) {						      \
-		    input_error ();                                           \
-		  }					                      \
-		  else							      \
-		    {							      \
-		      --read_in;					      \
-		      break;						      \
-		    }							\
-		}						      \
-		val = c;						      \
-		if (val >= 0x80)					      \
-		  {							      \
-		    if ((c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe)	      \
-		      encode_error ();					      \
-		    if ((c & 0xe0) == 0xc0)				      \
-		      {							      \
-			/* We expect two bytes.  */			      \
-			cnt = 1;					      \
-			val &= 0x1f;					      \
-		      }							      \
-		    else if ((c & 0xf0) == 0xe0)			      \
-		      {							      \
-			/* We expect three bytes.  */			      \
-			cnt = 2;					      \
-			val &= 0x0f;					      \
-		      }							      \
-		    else if ((c & 0xf8) == 0xf0)			      \
-		      {							      \
-			/* We expect four bytes.  */			      \
-			cnt = 3;					      \
-			val &= 0x07;					      \
-		      }							      \
-		    else if ((c & 0xfc) == 0xf8)			      \
-		      {							      \
-			/* We expect five bytes.  */			      \
-			cnt = 4;					      \
-			val &= 0x03;					      \
-		      }							      \
-		    else						      \
-		      {							      \
-			/* We expect six bytes.  */			      \
-			cnt = 5;					      \
-			val &= 0x01;					      \
-		      }							      \
-		    							      \
-		    do							      \
-		      {							      \
-			c = inchar ();					      \
-			if (c == EOF					      \
-			    || (c & 0xc0) == 0x80 || (c & 0xfe) == 0xfe)      \
-			  encode_error ();				      \
-			val <<= 6;					      \
-			val |= c & 0x3f;				      \
-		      }							      \
-		    while (--cnt > 0);					      \
-		  }							      \
-									      \
-		if (!(flags & MSUPPRESS))				      \
-		  *wstr++ = val;					      \
-		first = 0
-
-		NEXT_WIDE_CHAR (first);
-	      }
-	    while (--width > 0);
-
-	    if (width > 0)
-	      /* I.e., EOF was read.  */
-	      --read_in;
-
-	    if (!(flags & MSUPPRESS))
-	      ++done;
-	  }
-	  break;
-
-	case 's':		/* Read a string.  */
-	  if (flags & MLONG)
-	    /* We have to process a wide character string.  */
-	    goto wide_char_string;
-
-#define STRING_ARG(Str, Type)						      \
-	  if (!(flags & MSUPPRESS))					      \
-	    {								      \
-	      if (flags & MMALLOC)					      \
-		{							      \
-		  /* The string is to be stored in a malloc'd buffer.  */     \
-		  strptr = ARG (char **);				      \
-		  if (strptr == NULL)					      \
-		    conv_error ();					      \
-		  /* Allocate an initial buffer.  */			      \
-		  strsize = 100;					      \
-		  *strptr = malloc (strsize * sizeof (Type));		      \
-		  Str = (Type *) *strptr;				      \
-		}							      \
-	      else							      \
-		Str = ARG (Type *);					      \
-	      if (Str == NULL)						      \
-		conv_error ();						      \
-	    }
-	  STRING_ARG (str, char);
-
-	  c = inchar ();
-	  if (c == EOF)
-	    input_error ();
-
-	  do
-	    {
-	      if (isspace (c))
-		{
-		  my_ungetc (c, s);
-		  break;
-		}
-#define	STRING_ADD_CHAR(Str, c, Type)					      \
-	      if (!(flags & MSUPPRESS))					      \
-		{							      \
-		  *Str++ = c;						      \
-		  if ((flags & MMALLOC) && (char *) Str == *strptr + strsize)  \
-		    {							      \
-		      /* Enlarge the buffer.  */			      \
-		      Str = realloc (*strptr, strsize * 2 * sizeof (Type));   \
-		      if (Str == NULL)					      \
-			{						      \
-			  /* Can't allocate that much.  Last-ditch effort.  */\
-			  Str = realloc (*strptr,			      \
-					 (strsize + 1) * sizeof (Type));      \
-			  if (Str == NULL)				      \
-			    {						      \
-			      /* We lose.  Oh well.			      \
-				 Terminate the string and stop converting,    \
-				 so at least we don't skip any input.  */     \
-			      ((Type *) (*strptr))[strsize] = '\0';	      \
-			      ++done;					      \
-			      conv_error ();				      \
-			    }						      \
-			  else						      \
-			    {						      \
-			      *strptr = (char *) Str;			      \
-			      Str = ((Type *) *strptr) + strsize;	      \
-			      ++strsize;				      \
-			    }						      \
-			}						      \
-		      else						      \
-			{						      \
-			  *strptr = (char *) Str;			      \
-			  Str = ((Type *) *strptr) + strsize;		      \
-			  strsize *= 2;					      \
-			}						      \
-		    }							      \
-		}
-	      STRING_ADD_CHAR (str, c, char);
-	    } while ((width <= 0 || --width > 0) && inchar () != EOF);
-
-	  if (!(flags & MSUPPRESS))
-	    {
-	      *str = '\0';
-	      ++done;
-	    }
-	  break;
-
-	case 'S':
-	  /* Wide character string.  */
-	wide_char_string:
-	  {
-	    wint_t val;
-	    int first = 1;
-	    STRING_ARG (wstr, wchar_t);
-
-	    do
-	      {
-		size_t cnt = 0;
-		NEXT_WIDE_CHAR (first);
-
-		if (iswspace (val))
-		  {
-		    /* XXX We would have to push back the whole wide char
-		       with possibly many bytes.  But since scanf does
-		       not make a difference for white space characters
-		       we can simply push back a simple <SP> which is
-		       guaranteed to be in the [:space:] class.  */
-		    my_ungetc (' ', s);
-		    break;
-		  }
-
-		STRING_ADD_CHAR (wstr, val, wchar_t);
-		first = 0;
-	      }
-	    while (width <= 0 || --width > 0);
-
-	    if (!(flags & MSUPPRESS))
-	      {
-		*wstr = L'\0';
-		++done;
-	      }
-	  }
-	  break;
-
-	case 'x':	/* Hexadecimal integer.  */
-	case 'X':	/* Ditto.  */
-	  base = 16;
-	  number_signed = 0;
-	  goto number;
-
-	case 'o':	/* Octal integer.  */
-	  base = 8;
-	  number_signed = 0;
-	  goto number;
-
-	case 'u':	/* Unsigned decimal integer.  */
-	  base = 10;
-	  number_signed = 0;
-	  goto number;
-
-	case 'd':	/* Signed decimal integer.  */
-	  base = 10;
-	  number_signed = 1;
-	  goto number;
-
-	case 'i':	/* Generic number.  */
-	  base = 0;
-	  number_signed = 1;
-
-	number:
-	  c = inchar ();
-	  if (c == EOF)
-	    input_error ();
-
-	  /* Check for a sign.  */
-	  if (c == '-' || c == '+')
-	    {
-	      ADDW (c);
-	      if (width > 0)
-		--width;
-	      c = inchar ();
-	    }
-
-	  /* Look for a leading indication of base.  */
-	  if (width != 0 && c == '0')
-	    {
-	      if (width > 0)
-		--width;
-
-	      ADDW (c);
-	      c = inchar ();
-
-	      if (width != 0 && tolower (c) == 'x')
-		{
-		  if (base == 0)
-		    base = 16;
-		  if (base == 16)
-		    {
-		      if (width > 0)
-			--width;
-		      c = inchar ();
-		    }
-		}
-	      else if (base == 0)
-		base = 8;
-	    }
-
-	  if (base == 0)
-	    base = 10;
-
-	  /* Read the number into workspace.  */
-	  while (c != EOF && width != 0)
-	    {
-	      if (base == 16 ? !isxdigit (c) :
-		  ((!isdigit (c) || c - '0' >= base) &&
-		   !((flags & MGROUP) && base == 10 && c == thousands)))
-		break;
-	      ADDW (c);
-	      if (width > 0)
-		--width;
-
-	      c = inchar ();
-	    }
-
-	  /* The just read character is not part of the number anymore.  */
-	  my_ungetc (c, s);
-
-	  if (wpsize == 0 ||
-	      (wpsize == 1 && (wp[0] == '+' || wp[0] == '-')))
-	    /* There was no number.  */
-	    conv_error ();
-
-	  /* Convert the number.  */
-	  ADDW ('\0');
-	  if (flags & MLONGDBL)
-	    {
-//	      if (number_signed)
-//		num.q = __strtoq_internal (wp, &tw, base, flags & GROUP);
-//	      else
-//		num.uq = __strtouq_internal (wp, &tw, base, flags & GROUP);
-	    }
-	  else
-	    {
-	      if (number_signed)
-		num.l = __strtol_internal (wp, &tw, base, flags & MGROUP);
-	      else
-		num.ul = __strtoul_internal (wp, &tw, base, flags & MGROUP);
-	    }
-	  if (wp == tw)
-	    conv_error ();
-
-	  if (!(flags & MSUPPRESS))
-	  {
-	    if (! number_signed)
-		{
-			if (flags & MLONGDBL) {
-		    		*ARG (unsigned MLONGLONG int *) = num.uq;
-			}
-			else if (flags & MLONG)
-				*ARG (unsigned long int *) = num.ul;
-			else if (flags & MSHORT)
-				*ARG (unsigned short int *) = (unsigned short int) num.ul;
-			else
-				*ARG (unsigned int *) = (unsigned int) num.ul;
-		}
-	    else
-		{
-			if (flags & MLONGDBL) {
-			    *ARG (MLONGLONG int *) = num.q;
-			}
-			else if (flags & MLONG)
-				*ARG (long int *) = num.l;
-			else if (flags & MSHORT)
-				*ARG (short int *) = (short int) num.l;
-			else
-				*ARG (int *) = (int) num.l;
-		}
-	    ++done;
-	  }
-	  break;
-
-	case 'e':	/* Floating-point numbers.  */
-	case 'E':
-	case 'f':
-	case 'g':
-	case 'G':
-	  c = inchar ();
-	  if (c == EOF)
-	    input_error ();
-
-	  /* Check for a sign.  */
-	  if (c == '-' || c == '+')
-	    {
-	      negative = c == '-';
-	      if (inchar () == EOF)
-		/* EOF is only an input error before we read any chars.  */
-		conv_error ();
-	      if (width > 0)
-		--width;
-	    }
-	  else
-	    negative = 0;
-
-	  got_dot = got_e = 0;
-	  do
-	    {
-	      if (isdigit (c))
-		ADDW (c);
-	      else if (got_e && wp[wpsize - 1] == 'e'
-		       && (c == '-' || c == '+'))
-		ADDW (c);
-	      else if (wpsize > 0 && !got_e && tolower (c) == 'e')
-		{
-		  ADDW ('e');
-		  got_e = got_dot = 1;
-		}
-	      else if (c == decimal && !got_dot)
-		{
-		  ADDW (c);
-		  got_dot = 1;
-		}
-	      else if ((flags & MGROUP) && c == thousands && !got_dot)
-		ADDW (c);
-	      else
-		{
-		  /* The last read character is not part of the number
-		     anymore.  */
-		  my_ungetc (c, s);
-		  break;
-		}
-	      if (width > 0)
-		--width;
-	    }
-	  while (width != 0 && inchar () != EOF);
-
-	  if (wpsize == 0)
-	    conv_error ();
-
-	  /* Convert the number.  */
-	  ADDW ('\0');
-	  if (flags & MLONGDBL)
-	    {
-	      long double d = __strtold_internal (wp, &tw, flags & MGROUP);
-	      if (!(flags & MSUPPRESS) && tw != wp)
-		*ARG (long double *) = negative ? -d : d;
-	    }
-	  else if (flags & MLONG)
-	    {
-	      double d = __strtod_internal (wp, &tw, flags & MGROUP);
-	      if (!(flags & MSUPPRESS) && tw != wp)
-		*ARG (double *) = negative ? -d : d;
-	    }
-	  else
-	    {
-	      float d = __strtof_internal (wp, &tw, flags & MGROUP);
-	      if (!(flags & MSUPPRESS) && tw != wp)
-		*ARG (float *) = negative ? -d : d;
-	    }
-
-	  if (tw == wp)
-	    conv_error ();
-
-	  if (!(flags & MSUPPRESS))
-	    ++done;
-	  break;
-
-	case '[':	/* Character class.  */
-	  if (flags & MLONG)
-	    {
-	      STRING_ARG (wstr, wchar_t);
-	      c = '\0';		/* This is to keep gcc quiet.  */
-	    }
-	  else
-	    {
-	      STRING_ARG (str, char);
-
-	      c = inchar ();
-	      if (c == EOF)
-		input_error ();
-	    }
-
-	  if (*f == '^')
-	    {
-	      ++f;
-	      not_in = 1;
-	    }
-	  else
-	    not_in = 0;
-
-	  /* Fill WP with byte flags indexed by character.
-	     We will use this flag map for matching input characters.  */
-	  if (wpmax < UCHAR_MAX)
-	    {
-	      wpmax = UCHAR_MAX;
-	      wp = (char *) alloca (wpmax);
-	    }
-	  memset (wp, 0, UCHAR_MAX);
-
-	  fc = *f;
-	  if (fc == ']' || fc == '-')
-	    {
-	      /* If ] or - appears before any char in the set, it is not
-		 the terminator or separator, but the first char in the
-		 set.  */
-	      wp[fc] = 1;
-	      ++f;
-	    }
-
-	  while ((fc = *f++) != '\0' && fc != ']')
-	    {
-	      if (fc == '-' && *f != '\0' && *f != ']' &&
-		  (unsigned char) f[-2] <= (unsigned char) *f)
-		{
-		  /* Add all characters from the one before the '-'
-		     up to (but not including) the next format char.  */
-		  for (fc = f[-2]; fc < *f; ++fc)
-		    wp[fc] = 1;
-		}
-	      else
-		/* Add the character to the flag map.  */
-		wp[fc] = 1;
-	    }
-	  if (fc == '\0')
-	    {
-	      if (!(flags & MLONG))
-		my_ungetc (c, s);
-	      conv_error();
-	    }
-
-	  if (flags & MLONG)
-	    {
-	      wint_t val;
-	      int first = 1;
-
-	      do
-		{
-		  size_t cnt = 0;
-		  NEXT_WIDE_CHAR (first);
-		  if (val > 255 || wp[val] == not_in)
-		    {
-		      /* XXX We have a problem here.  We read a wide
-			 character and this possibly took several
-			 bytes.  But we can only push back one single
-			 character.  To be sure we don't create wrong
-			 input we push it back only in case it is
-			 representable within one byte.  */
-		      if (val < 0x80)
-			my_ungetc (val, s);
-		      break;
-		    }
-		  STRING_ADD_CHAR (wstr, val, wchar_t);
-		  if (width > 0)
-		    --width;
-		  first = 0;
-		}
-	      while (width != 0);
-
-	      if (first)
-		conv_error ();
-
-	      if (!(flags & MSUPPRESS))
-		{
-		  *wstr = L'\0';
-		  ++done;
-		}
-	    }
-	  else
-	    {
-	      num.ul = read_in - 1; /* -1 because we already read one char.  */
-	      do
-		{
-		  if (wp[c] == not_in)
-		    {
-		      my_ungetc (c, s);
-		      break;
-		    }
-		  STRING_ADD_CHAR (str, c, char);
-		  if (width > 0)
-		    --width;
-		}
-	      while (width != 0 && inchar () != EOF);
-
-	      if (read_in == num.ul)
-		conv_error ();
-
-	      if (!(flags & MSUPPRESS))
-		{
-		  *str = '\0';
-		  ++done;
-		}
-	    }
-	  break;
-
-	case 'p':	/* Generic pointer.  */
-	  base = 16;
-	  /* A PTR must be the same size as a `long int'.  */
-	  flags &= ~(MSHORT|MLONGDBL);
-	  flags |= MLONG;
-	  number_signed = 0;
-	  goto number;
-	}
-    }
-
-  /* The last thing we saw int the format string was a white space.
-     Consume the last white spaces.  */
-  if (skip_space)
-    {
-      do
-	c = inchar ();
-      while (isspace (c));
-      my_ungetc (c, s);
-    }
-
-
-  return done;
-}
-
-
-double __strtod_internal  (const char *__nptr,char **__endptr, int __group)
-{
-	return strtod(__nptr,__endptr);
-}
-float __strtof_internal (const char *__nptr, char **__endptr,int __group)
-{
-	return (float)strtod(__nptr,__endptr);
-}
-static double powten[] =
-{
-  1e1L, 1e2L, 1e4L, 1e8L, 1e16L, 1e32L, 1e64L, 1e128L, 1e256L,
-  /*1e512L, 1e512L*1e512L, 1e2048L, 1e4096L*///cjh
-};
-
-long double __strtold_internal  (const char *s,char **sret, int __group)
-{
-
-  long double r;		/* result */
-  int e, ne;			/* exponent */
-  int sign;			/* +- 1.0 */
-  int esign;
-  int flags=0;
-  int l2powm1;
-
-  r = 0.0L;
-  sign = 1;
-  e = ne = 0;
-  esign = 1;
-
-  while(*s && isspace(*s))
-    s++;
-
-  if (*s == '+')
-    s++;
-  else if (*s == '-')
-  {
-    sign = -1;
-    s++;
-  }
-
-  while ((*s >= '0') && (*s <= '9'))
-  {
-    flags |= 1;
-    r *= 10.0L;
-    r += *s - '0';
-    s++;
-  }
-
-  if (*s == '.')
-  {
-    s++;
-    while ((*s >= '0') && (*s <= '9'))
-    {
-      flags |= 2;
-      r *= 10.0L;
-      r += *s - '0';
-      s++;
-      ne++;
-    }
-  }
-  if (flags == 0)
-  {
-    if (sret)
-      *sret = (char *)s;
-    return 0.0L;
-  }
-
-  if ((*s == 'e') || (*s == 'E'))
-  {
-    s++;
-    if (*s == '+')
-      s++;
-    else if (*s == '-')
-    {
-      s++;
-      esign = -1;
-    }
-    while ((*s >= '0') && (*s <= '9'))
-    {
-      e *= 10;
-      e += *s - '0';
-      s++;
-    }
-  }
-  if (esign < 0)
-  {
-    esign = -esign;
-    e = -e;
-  }
-  e = e - ne;
-  if (e < -4096)
-  {
-    /* possibly subnormal number, 10^e would overflow */
-    r *= 1.0e-2048L;
-    e += 2048;
-  }
-  if (e < 0)
-  {
-    e = -e;
-    esign = -esign;
-  }
-  if (e >= 8192)
-    e = 8191;
-  if (e)
-  {
-    double d = 1.0L;
-    l2powm1 = 0;
-    while (e)
-    {
-      if (e & 1)
-	d *= powten[l2powm1];
-      e >>= 1;
-      l2powm1++;
-    }
-    if (esign > 0)
-      r *= d;
-    else
-      r /= d;
-  }
-  if (sret)
-    *sret = (char *)s;
-  return r * sign;
-
-  return 0;
-}
-long int __strtol_internal (const char *__nptr, char **__endptr,	int __base, int __group)
-{
-	return strtol(__nptr,__endptr, __base);
-}
-unsigned long int __strtoul_internal  (const char *__nptr,  char **__endptr, int __base, int __group)
-{
-	return strtoul(__nptr,__endptr, __base);
-}
-
-
-
-/* Read formatted input from S according to the format
-   string FORMAT, using the argument list in ARG.  */
-int
-my_vsscanf (const char *s,const char *format,va_list arg)
-{
-  MYFILE f;
-
-//   if (s == NULL)
-//     {
-//       __set_errno (EINVAL);
-//       return -1;
-//     }
-
-  memset ((void *) &f, 0, sizeof (f));
-
-
-
-  f._flag = _IOREAD;
-  f._ptr = (char *)s;
-  f._base = (char *)s;
-  f._bufsiz = strlen(s);
-  f._cnt = f._bufsiz;
-
-
-  return __vfscanf (&f, format, arg);
-}
-
-int sscanf (const char *s,const char *format, ...)
-{
-	va_list arg;
-	int done;
-
-	va_start (arg, format);
-	done = my_vsscanf (s, format, arg);
-	va_end (arg);
-
-	return done;
-}
-
-void __assert_func(const char *file, int line, const char *a, const char *b)
-{
-
-}
-
diff --git a/cocos2dx/platform/bada/CCPlatformFunc_bada.h b/cocos2dx/platform/bada/CCPlatformFunc_bada.h
index 067b330ead..c9ec907ad4 100644
--- a/cocos2dx/platform/bada/CCPlatformFunc_bada.h
+++ b/cocos2dx/platform/bada/CCPlatformFunc_bada.h
@@ -5,11 +5,17 @@
 extern "C" {
 #endif
 
+#ifndef CC_BADA_2_0
+
 #define printf(...) AppLog(__VA_ARGS__)
 
 int sprintf(char* buf, const char *format, ...);
 int sscanf (const char *s,const char *format, ...);
 
+#endif
+
+void badaAssert(const char* pFunction, int lineNumber, const char* pszContent);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cocos2dx/textures/CCTextureAtlas.cpp b/cocos2dx/textures/CCTextureAtlas.cpp
index 7c0abbf4b1..0b351e590d 100644
--- a/cocos2dx/textures/CCTextureAtlas.cpp
+++ b/cocos2dx/textures/CCTextureAtlas.cpp
@@ -187,6 +187,9 @@ char * CCTextureAtlas::description()
 
 void CCTextureAtlas::initIndices()
 {
+	if (m_uCapacity <= 0)
+		return;
+
 	for( unsigned int i=0; i < m_uCapacity; i++)
 	{
 #if CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP
@@ -322,8 +325,20 @@ bool CCTextureAtlas::resizeCapacity(unsigned int newCapacity)
 	m_uTotalQuads = min(m_uTotalQuads, newCapacity);
 	m_uCapacity = newCapacity;
 
-	void * tmpQuads = realloc( m_pQuads, sizeof(m_pQuads[0]) * m_uCapacity );
-	void * tmpIndices = realloc( m_pIndices, sizeof(m_pIndices[0]) * m_uCapacity * 6 );
+	void * tmpQuads = NULL;
+	void * tmpIndices = NULL;
+	
+	// when calling initWithTexture(fileName, 0) on bada device, calloc(0, 1) will fail and return NULL,
+	// so here must judge whether m_pQuads and m_pIndices is NULL.
+	if (m_pQuads == NULL)
+		tmpQuads = calloc(sizeof(m_pQuads[0]) * m_uCapacity, 1);
+	else
+		tmpQuads = realloc( m_pQuads, sizeof(m_pQuads[0]) * m_uCapacity );
+
+	if (m_pIndices == NULL)
+		tmpIndices = calloc(sizeof(m_pIndices[0]) * m_uCapacity * 6, 1);
+	else
+		tmpIndices = realloc( m_pIndices, sizeof(m_pIndices[0]) * m_uCapacity * 6 );
 
 	if( ! ( tmpQuads && tmpIndices) ) {
 		//CCLOG("cocos2d: CCTextureAtlas: not enough memory");
@@ -372,6 +387,8 @@ void CCTextureAtlas::drawNumberOfQuads(unsigned int n, unsigned int start)
 	// Default GL states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
 	// Needed states: GL_TEXTURE_2D, GL_VERTEX_ARRAY, GL_COLOR_ARRAY, GL_TEXTURE_COORD_ARRAY
 	// Unneeded states: -
+	if (0 == n)
+		return;
 
 	glBindTexture(GL_TEXTURE_2D, m_pTexture->getName());
 
diff --git a/tests/test.bada/sdk2.0/.cproject b/tests/test.bada/sdk2.0/.cproject
index 3cabe4ed95..4864571b05 100644
--- a/tests/test.bada/sdk2.0/.cproject
+++ b/tests/test.bada/sdk2.0/.cproject
@@ -24,7 +24,7 @@
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactExtension="exe" artifactName="TestCocos2dx" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.1659310185" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist lib mkdir lib) &amp; (copy /y ..\..\..\cocos2dx\proj.bada\sdk2.0\.Target-Debug\libcocos2dx.so lib) &amp; (copy /y ..\..\..\CocosDenshion\proj.bada\sdk2.0\.Target-Debug\libCocosDenshion.so lib) &amp; (if not exist Res mkdir Res) &amp; (xcopy /s /y ..\..\Res\*.* Res)">
+				<configuration artifactExtension="exe" artifactName="TestCocos2dx" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.sharedLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.sharedLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.osp.gnu.target.exe.debug.1659310185" name="Target-Debug" parent="cdt.managedbuild.config.osp.gnu.target.exe.debug" prebuildStep="cd .. &amp; (if not exist Res mkdir Res) &amp; (xcopy /s /y ..\..\Res\*.* Res)">
 					<folderInfo id="cdt.managedbuild.config.osp.gnu.target.exe.debug.1659310185." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug.209599858" name="bada GCC ToolChain" superClass="cdt.managedbuild.toolchain.osp.gnu.target.exe.debug">
 							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.Cygwin_PE;org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug.1675194339" name="Debug Platform" osList="osp" superClass="cdt.managedbuild.target.osp.gnu.target.platform.exe.debug"/>
@@ -57,16 +57,18 @@
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/osp_rt0.a&quot;"/>
 									<listOptionValue builtIn="false" value="../../../../Box2D/proj.bada/sdk2.0/.Target-Debug/libBox2D.a"/>
 									<listOptionValue builtIn="false" value="../../../../chipmunk/proj.bada/sdk2.0/.Target-Debug/libchipmunk.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/proj.bada/sdk2.0_StaticLib/.Target-Debug/libcocos2dx.a"/>
+									<listOptionValue builtIn="false" value="../../../../CocosDenshion/proj.bada/sdk2.0_StaticLib/.Target-Debug/libCocosDenshion.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/libjpeg/sdk2.0/.Target-Debug/libjpeg.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/png/sdk2.0/.Target-Debug/libpng.a"/>
+									<listOptionValue builtIn="false" value="../../../../cocos2dx/platform/third_party/bada/src/zlib/sdk2.0/.Target-Debug/libzlib.a"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FOsp.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsOpengl.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/FGraphicsEgl.so&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}/StubDynCast.so&quot;"/>
 								</option>
 								<option id="osp.gnu.cpp.link.option.other.689865278" name="Other options (-Xlinker [option])" superClass="osp.gnu.cpp.link.option.other"/>
-								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.851145674" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs">
-									<listOptionValue builtIn="false" value="cocos2dx"/>
-									<listOptionValue builtIn="false" value="CocosDenshion"/>
-								</option>
+								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.851145674" name="Libraries (-l)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs" valueType="libs"/>
 								<option id="osp.gnu.target.cpp.link.debug.exe.option.libs.paths.1425715273" name="Library search path (-L)" superClass="osp.gnu.target.cpp.link.debug.exe.option.libs.paths" valueType="libPaths">
 									<listOptionValue builtIn="false" value="&quot;${TARGET_LIB_PATH}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PROJECT_ROOT}/lib&quot;"/>