[Scummvm-cvs-logs] SF.net SVN: scummvm:[34407] scummvm/trunk/backends/platform/symbian

anotherguest at users.sourceforge.net anotherguest at users.sourceforge.net
Sun Sep 7 15:40:31 CEST 2008


Revision: 34407
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34407&view=rev
Author:   anotherguest
Date:     2008-09-07 13:40:30 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
Updated readme about usage of snprintf source
Added vsnprintf implementation.
Cleanout SymbianOS.cpp from old file functions.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/symbian/README
    scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp

Added Paths:
-----------
    scummvm/trunk/backends/platform/symbian/src/vsnprintf.h

Modified: scummvm/trunk/backends/platform/symbian/README
===================================================================
--- scummvm/trunk/backends/platform/symbian/README	2008-09-07 13:19:16 UTC (rev 34406)
+++ scummvm/trunk/backends/platform/symbian/README	2008-09-07 13:40:30 UTC (rev 34407)
@@ -8,7 +8,19 @@
  Copyright (C) 2003-2005 Andreas 'Sprawl' Karlsson
  $Id$
 
+Using parts of snprintf.c by 
+Mark Martinec <mark.martinec at ijs.si>, April 1999, June 2000
+Copyright \xA9 1999,2000,2001,2002 Mark Martinec. All rights reserved. 
+under these conditions:
+"Terms and conditions ...
 
+This program is free software; it is dual licensed, the terms of the "Frontier Artistic License" or 
+the "GNU General Public License" can be chosen at your discretion. 
+The chosen license then applies solely and in its entirety. 
+Both licenses come with this Kit."
+
+
+
 About ScummVM
 --------------
 	The original ports (uptil 0.7.1) were made by Andreas Karlsson and Lars Persson.

Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-09-07 13:19:16 UTC (rev 34406)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp	2008-09-07 13:40:30 UTC (rev 34407)
@@ -24,6 +24,7 @@
 
 #include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError()
 #include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
+#include <bautils.h>
 	
 #include "backends/fs/symbian/symbian-fs-factory.h"
 #include "backends/platform/symbian/src/SymbianOS.h"
@@ -45,17 +46,8 @@
 
 
 #define DEFAULT_CONFIG_FILE "scummvm.ini"
+#define DEFAULT_SAVE_PATH "Savegames"
 
-
-#define KInputBufferLength 128
-// Symbian libc file functionality in order to provide shared file handles
-struct TSymbianFileEntry {
-	RFile iFileHandle;
-	char iInputBuffer[KInputBufferLength];
-	TInt iInputBufferLen;
-	TInt iInputPos;
-};
-
 #define FILE void
 
 ////////// extern "C" ///////////////////////////////////////////////////
@@ -151,7 +143,28 @@
 }
 
 void OSystem_SDL_Symbian::initBackend() {
+	// First set the extrapath (for installed dat files etc)
 	ConfMan.set("extrapath", Symbian::GetExecutablePath());
+
+	// Calculate the default savepath
+	Common::String savePath;
+	savePath = Symbian::GetExecutablePath();
+	savePath += DEFAULT_SAVE_PATH "\\";
+	ConfMan.registerDefault("savepath", savePath);
+
+	// If savepath has not already been set then set it
+	if (!ConfMan.hasKey("savepath")) {
+		ConfMan.set("savepath", savePath);
+	
+	}
+
+	// Ensure that the current set path (might have been altered by the user) exists
+	Common::String currentPath = ConfMan.get("savepath");
+	TFileName fname;
+	TPtrC8 ptr((const unsigned char*)currentPath.c_str(),currentPath.size());
+	fname.Copy(ptr);
+	BaflUtils::EnsurePathExistsL(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), fname);		
+
 	ConfMan.setBool("FM_high_quality", false);
 #if !defined(S60) || defined(S60V3) // S60 has low quality as default
 	ConfMan.setBool("FM_medium_quality", true);
@@ -499,231 +512,36 @@
 	return NULL;
 }
 
-FILE*	symbian_fopen(const char* name, const char* mode) {
-	TSymbianFileEntry* fileEntry = new TSymbianFileEntry;
-	fileEntry->iInputPos = KErrNotFound;
-
-	if (fileEntry != NULL) {
-		TInt modeLen = strlen(mode);
-
-		TPtrC8 namePtr((unsigned char*) name, strlen(name));
-		TFileName tempFileName;
-		tempFileName.Copy(namePtr);
-
-		TInt fileMode = EFileRead;
-
-		if (mode[0] == 'a')
-			fileMode = EFileWrite;
-
-		if (!((modeLen > 1 && mode[1] == 'b') || (modeLen > 2 && mode[2] == 'b'))) {
-			fileMode |= EFileStreamText;
-		}
-
-		if ((modeLen > 1 && mode[1] == '+') || (modeLen > 2 && mode[2] == '+')) {
-			fileMode = fileMode| EFileWrite;
-		}
-
-		fileMode = fileMode| EFileShareAny;
-
-		switch(mode[0]) {
-		case 'a':
-			if (fileEntry->iFileHandle.Open(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
-				if (fileEntry->iFileHandle.Create(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
-					delete fileEntry;
-					fileEntry = NULL;
-				}
-			}
-			break;
-		case 'r':
-			if (fileEntry->iFileHandle.Open(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
-				delete fileEntry;
-				fileEntry = NULL;
-			}
-			break;
-
-		case 'w':
-			if (fileEntry->iFileHandle.Replace(static_cast<OSystem_SDL_Symbian*>(g_system)->FsSession(), tempFileName, fileMode) != KErrNone) {
-				delete fileEntry;
-				fileEntry = NULL;
-			}
-			break;
-		}
-	}
-	return (FILE*) fileEntry;
+extern "C"
+{
+// Include the snprintf and vsnprintf implementations as 'C' code
+#include "vsnprintf.h"
 }
 
-void symbian_fclose(FILE* handle) {
-	((TSymbianFileEntry*)(handle))->iFileHandle.Close();
-
-	delete (TSymbianFileEntry*)(handle);
-}
-
-size_t symbian_fread(const void* ptr, size_t size, size_t numItems, FILE* handle) {
-	TSymbianFileEntry* entry = ((TSymbianFileEntry*)(handle));
-	TUint32 totsize = size*numItems;
-	TPtr8 pointer ( (unsigned char*) ptr, totsize);
-
-	// Nothing cached and we want to load at least KInputBufferLength bytes
-	if(totsize >= KInputBufferLength) {	
-		TUint32 totLength = 0;
-		if(entry->iInputPos != KErrNotFound)
-		{
-			TPtr8 cacheBuffer( (unsigned char*) entry->iInputBuffer+entry->iInputPos, entry->iInputBufferLen - entry->iInputPos, KInputBufferLength);
-			pointer.Append(cacheBuffer);
-			entry->iInputPos = KErrNotFound;
-			totLength+=pointer.Length();
-			pointer.Set(totLength+(unsigned char*) ptr, 0, totsize-totLength);
-		}
-
-		entry->iFileHandle.Read(pointer);
-		totLength+=pointer.Length();
-
-		pointer.Set((unsigned char*) ptr, totLength, totsize);
-
-	}
-	else {
-		// Nothing in buffer	
-		if(entry->iInputPos == KErrNotFound) {
-			TPtr8 cacheBuffer( (unsigned char*) entry->iInputBuffer, KInputBufferLength);
-			entry->iFileHandle.Read(cacheBuffer);
-
-			if(cacheBuffer.Length() >= totsize) {
-				pointer.Copy(cacheBuffer.Left(totsize));
-				entry->iInputPos = totsize;
-				entry->iInputBufferLen = cacheBuffer.Length();
-			}
-			else {
-				pointer.Copy(cacheBuffer);
-				entry->iInputPos = KErrNotFound;
-			}
-
-		}
-		else {
-			TPtr8 cacheBuffer( (unsigned char*) entry->iInputBuffer, entry->iInputBufferLen, KInputBufferLength);
-
-			if(entry->iInputPos+totsize < entry->iInputBufferLen) {
-				pointer.Copy(cacheBuffer.Mid(entry->iInputPos, totsize));
-				entry->iInputPos+=totsize;
-			}
-			else {
-			
-			pointer.Copy(cacheBuffer.Mid(entry->iInputPos, entry->iInputBufferLen-entry->iInputPos));
-			cacheBuffer.SetLength(0);
-			entry->iFileHandle.Read(cacheBuffer);
-
-			if(cacheBuffer.Length() >= totsize-pointer.Length()) {
-					TUint32 restSize = totsize-pointer.Length();
-					pointer.Append(cacheBuffer.Left(restSize));
-					entry->iInputPos = restSize;
-					entry->iInputBufferLen = cacheBuffer.Length();
-				}
-				else {
-					pointer.Append(cacheBuffer);
-					entry->iInputPos = KErrNotFound;
-				}
-			}
-		}
-	}	
-
-	return pointer.Length()/size;
-}
-
-size_t symbian_fwrite(const void* ptr, size_t size, size_t numItems, FILE* handle) {
-	TPtrC8 pointer( (unsigned char*) ptr, size*numItems);
-
-	((TSymbianFileEntry*)(handle))->iInputPos = KErrNotFound;
-	if (((TSymbianFileEntry*)(handle))->iFileHandle.Write(pointer) == KErrNone) {
-		return numItems;
-	}
-
-	return 0;
-}
-
-bool symbian_feof(FILE* handle) {
-	TInt pos = 0;
-	TSymbianFileEntry* entry = ((TSymbianFileEntry*)(handle));
-
-	if (entry->iFileHandle.Seek(ESeekCurrent, pos) == KErrNone) {
-
-		TInt size = 0;
-		if (entry->iFileHandle.Size(size) == KErrNone) {
-			if(entry->iInputPos == KErrNotFound && pos == size) 			
-				return true;
-
-			if(entry->iInputPos != KErrNotFound && pos == size && entry->iInputPos == entry->iInputBufferLen)
-				return true;
-
-			return false;
-		}
-	}
-	return true;
-}
-
-long int symbian_ftell(FILE* handle) {
-	TInt pos = 0;
-	TSymbianFileEntry* entry = ((TSymbianFileEntry*)(handle));
-
-	entry->iFileHandle.Seek(ESeekCurrent, pos);
-	if(entry->iInputPos != KErrNotFound)
-		{
-		pos+=(entry->iInputPos - entry->iInputBufferLen);
-		}
-	return pos;
-}
-
-int symbian_fseek(FILE* handle, long int offset, int whence) {
-
-	TSeek seekMode = ESeekStart;
-	TInt pos = offset;
-	TSymbianFileEntry* entry = ((TSymbianFileEntry*)(handle));
-
-	switch(whence) {
-	case SEEK_SET:
-		seekMode = ESeekStart;
-		break;
-	case SEEK_CUR:
-		seekMode = ESeekCurrent;
-		if(entry->iInputPos != KErrNotFound) {
-			pos+=(entry->iInputPos - entry->iInputBufferLen);
-		}
-		break;
-	case SEEK_END:
-		seekMode = ESeekEnd;
-		break;
-
-	}
-	
-	entry->iInputPos = KErrNotFound;
-
-	return entry->iFileHandle.Seek(seekMode, pos);
-}
-
-void symbian_clearerr(FILE* /*handle*/) {
-}
-
-void	symbian_fflush(FILE* handle) {
-	((TSymbianFileEntry*)(handle))->iFileHandle.Flush();
-}
-
-int     symbian_ferror(FILE* /*handle*/) {
-	return 0;
-}
-
 /** Vibration support */
 #ifdef  USE_VIBRA_SE_PXXX
 void OSystem_SDL_Symbian::initializeVibration() {
-	_vibrationApi = SonyEricsson::CVibration::NewL();
+#ifdef UIQ3
+#else
+#endif
 }
 
 void OSystem_SDL_Symbian::vibrationOn(int vibraLength) {
-	// initialize?
+#ifdef UIQ3
+		// initialize?
 	if (!_vibrationApi) _vibrationApi = SonyEricsson::CVibration::NewL();
 	// do it!
 	_vibrationApi->VibrationOn(1, 1, vibraLength);
+#else
+
+#endif
 }
 
 void OSystem_SDL_Symbian::vibrationOff() {
+#ifdef UIQ3
+#else
 	_vibrationApi->VibrationOff();
+#endif
 }
 
 #endif //  USE_SE_PXX_VIBRA

Added: scummvm/trunk/backends/platform/symbian/src/vsnprintf.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/vsnprintf.h	                        (rev 0)
+++ scummvm/trunk/backends/platform/symbian/src/vsnprintf.h	2008-09-07 13:40:30 UTC (rev 34407)
@@ -0,0 +1,668 @@
+/*
+ * This is the vsnprintf for scummvm/symbian implementation from the original snprintf.c, 
+ * all support functions has been removed and vsnprintf renamed to symbian_vsnprintf
+ * snprintf.c - a portable implementation of snprintf
+ * According to the homepage this function could be licensed as either Frontier Aritistic or GPL.
+ * 
+ * AUTHOR
+ *   Mark Martinec <mark.martinec at ijs.si>, April 1999.
+ *
+ *   Copyright 1999, Mark Martinec. All rights reserved.
+ *
+ * TERMS AND CONDITIONS
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the "Frontier Artistic License" which comes
+ *   with this Kit.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty
+ *   of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *   See the Frontier Artistic License for more details.
+ *
+ *   You should have received a copy of the Frontier Artistic License
+ *   with this Kit in the file named LICENSE.txt .
+ *   If not, I'll be glad to provide one.
+ *
+ * FEATURES
+ * - careful adherence to specs regarding flags, field width and precision;
+ * - good performance for large string handling (large format, large
+ *   argument or large paddings). Performance is similar to system's sprintf
+ *   and in several cases significantly better (make sure you compile with
+ *   optimizations turned on, tell the compiler the code is strict ANSI
+ *   if necessary to give it more freedom for optimizations);
+ * - return value semantics per ISO/IEC 9899:1999 ("ISO C99");
+ * - written in standard ISO/ANSI C - requires an ANSI C compiler.
+ *
+ * SUPPORTED CONVERSION SPECIFIERS AND DATA TYPES
+ *
+ * This snprintf only supports the following conversion specifiers:
+ * s, c, d, u, o, x, X, p  (and synonyms: i, D, U, O - see below)
+ * with flags: '-', '+', ' ', '0' and '#'.
+ * An asterisk is supported for field width as well as precision.
+ *
+ * Length modifiers 'h' (short int), 'l' (long int),
+ * and 'll' (long long int) are supported.
+ * NOTE:
+ *   If macro SNPRINTF_LONGLONG_SUPPORT is not defined (default) the
+ *   length modifier 'll' is recognized but treated the same as 'l',
+ *   which may cause argument value truncation! Defining
+ *   SNPRINTF_LONGLONG_SUPPORT requires that your system's sprintf also
+ *   handles length modifier 'll'.  long long int is a language extension
+ *   which may not be portable.
+ *
+ * Conversion of numeric data (conversion specifiers d, u, o, x, X, p)
+ * with length modifiers (none or h, l, ll) is left to the system routine
+ * sprintf, but all handling of flags, field width and precision as well as
+ * c and s conversions is done very carefully by this portable routine.
+ * If a string precision (truncation) is specified (e.g. %.8s) it is
+ * guaranteed the string beyond the specified precision will not be referenced.
+ *
+ * Length modifiers h, l and ll are ignored for c and s conversions (data
+ * types wint_t and wchar_t are not supported).
+ *
+ * The following common synonyms for conversion characters are supported:
+ *   - i is a synonym for d
+ *   - D is a synonym for ld, explicit length modifiers are ignored
+ *   - U is a synonym for lu, explicit length modifiers are ignored
+ *   - O is a synonym for lo, explicit length modifiers are ignored
+ * The D, O and U conversion characters are nonstandard, they are supported
+ * for backward compatibility only, and should not be used for new code.
+ *
+ * The following is specifically NOT supported:
+ *   - flag ' (thousands' grouping character) is recognized but ignored
+ *   - numeric conversion specifiers: f, e, E, g, G and synonym F,
+ *     as well as the new a and A conversion specifiers
+ *   - length modifier 'L' (long double) and 'q' (quad - use 'll' instead)
+ *   - wide character/string conversions: lc, ls, and nonstandard
+ *     synonyms C and S
+ *   - writeback of converted string length: conversion character n
+ *   - the n$ specification for direct reference to n-th argument
+ *   - locales
+ *
+ * It is permitted for str_m to be zero, and it is permitted to specify NULL
+ * pointer for resulting string argument if str_m is zero (as per ISO C99).
+ *
+ * The return value is the number of characters which would be generated
+ * for the given input, excluding the trailing null. If this value
+ * is greater or equal to str_m, not all characters from the result
+ * have been stored in str, output bytes beyond the (str_m-1) -th character
+ * are discarded. If str_m is greater than zero it is guaranteed
+ * the resulting string will be null-terminated.
+ *
+ * NOTE that this matches the ISO C99, OpenBSD, and GNU C library 2.1,
+ * but is different from some older and vendor implementations,
+ * and is also different from XPG, XSH5, SUSv2 specifications.
+ * For historical discussion on changes in the semantics and standards
+ * of snprintf see printf(3) man page in the Linux programmers manual.
+ *
+ * Routines asprintf and vasprintf return a pointer (in the ptr argument)
+ * to a buffer sufficiently large to hold the resulting string. This pointer
+ * should be passed to free(3) to release the allocated storage when it is
+ * no longer needed. If sufficient space cannot be allocated, these functions
+ * will return -1 and set ptr to be a NULL pointer. These two routines are a
+ * GNU C library extensions (glibc).
+ *
+ * Routines asnprintf and vasnprintf are similar to asprintf and vasprintf,
+ * yet, like snprintf and vsnprintf counterparts, will write at most str_m-1
+ * characters into the allocated output string, the last character in the
+ * allocated buffer then gets the terminating null. If the formatted string
+ * length (the return value) is greater than or equal to the str_m argument,
+ * the resulting string was truncated and some of the formatted characters
+ * were discarded. These routines present a handy way to limit the amount
+ * of allocated memory to some sane value.
+ *
+ * AVAILABILITY
+ *   http://www.ijs.si/software/snprintf/
+ *
+ * REVISION HISTORY
+ * 1999-04	V0.9  Mark Martinec
+ *		- initial version, some modifications after comparing printf
+ *		  man pages for Digital Unix 4.0, Solaris 2.6 and HPUX 10,
+ *		  and checking how Perl handles sprintf (differently!);
+ * 1999-04-09	V1.0  Mark Martinec <mark.martinec at ijs.si>
+ *		- added main test program, fixed remaining inconsistencies,
+ *		  added optional (long long int) support;
+ * 1999-04-12	V1.1  Mark Martinec <mark.martinec at ijs.si>
+ *		- support the 'p' conversion (pointer to void);
+ *		- if a string precision is specified
+ *		  make sure the string beyond the specified precision
+ *		  will not be referenced (e.g. by strlen);
+ * 1999-04-13	V1.2  Mark Martinec <mark.martinec at ijs.si>
+ *		- support synonyms %D=%ld, %U=%lu, %O=%lo;
+ *		- speed up the case of long format string with few conversions;
+ * 1999-06-30	V1.3  Mark Martinec <mark.martinec at ijs.si>
+ *		- fixed runaway loop (eventually crashing when str_l wraps
+ *		  beyond 2^31) while copying format string without
+ *		  conversion specifiers to a buffer that is too short
+ *		  (thanks to Edwin Young <edwiny at autonomy.com> for
+ *		  spotting the problem);
+ *		- added macros PORTABLE_SNPRINTF_VERSION_(MAJOR|MINOR)
+ *		  to snprintf.h
+ * 2000-02-14	V2.0 (never released) Mark Martinec <mark.martinec at ijs.si>
+ *		- relaxed license terms: The Artistic License now applies.
+ *		  You may still apply the GNU GENERAL PUBLIC LICENSE
+ *		  as was distributed with previous versions, if you prefer;
+ *		- changed REVISION HISTORY dates to use ISO 8601 date format;
+ *		- added vsnprintf (patch also independently proposed by
+ *		  Caolan McNamara 2000-05-04, and Keith M Willenson 2000-06-01)
+ * 2000-06-27	V2.1  Mark Martinec <mark.martinec at ijs.si>
+ *		- removed POSIX check for str_m<1; value 0 for str_m is
+ *		  allowed by ISO C99 (and GNU C library 2.1) - (pointed out
+ *		  on 2000-05-04 by Caolan McNamara, caolan@ csn dot ul dot ie).
+ *		  Besides relaxed license this change in standards adherence
+ *		  is the main reason to bump up the major version number;
+ *		- added nonstandard routines asnprintf, vasnprintf, asprintf,
+ *		  vasprintf that dynamically allocate storage for the
+ *		  resulting string; these routines are not compiled by default,
+ *		  see comments where NEED_V?ASN?PRINTF macros are defined;
+ *		- autoconf contributed by Caolan McNamara
+ * 2000-10-06	V2.2  Mark Martinec <mark.martinec at ijs.si>
+ *		- BUG FIX: the %c conversion used a temporary variable
+ *		  that was no longer in scope when referenced,
+ *		  possibly causing incorrect resulting character;
+ *		- BUG FIX: make precision and minimal field width unsigned
+ *		  to handle huge values (2^31 <= n < 2^32) correctly;
+ *		  also be more careful in the use of signed/unsigned/size_t
+ *		  internal variables - probably more careful than many
+ *		  vendor implementations, but there may still be a case
+ *		  where huge values of str_m, precision or minimal field
+ *		  could cause incorrect behaviour;
+ *		- use separate variables for signed/unsigned arguments,
+ *		  and for short/int, long, and long long argument lengths
+ *		  to avoid possible incompatibilities on certain
+ *		  computer architectures. Also use separate variable
+ *		  arg_sign to hold sign of a numeric argument,
+ *		  to make code more transparent;
+ *		- some fiddling with zero padding and "0x" to make it
+ *		  Linux compatible;
+ *		- systematically use macros fast_memcpy and fast_memset
+ *		  instead of case-by-case hand optimization; determine some
+ *		  breakeven string lengths for different architectures;
+ *		- terminology change: 'format' -> 'conversion specifier',
+ *		  'C9x' -> 'ISO/IEC 9899:1999 ("ISO C99")',
+ *		  'alternative form' -> 'alternate form',
+ *		  'data type modifier' -> 'length modifier';
+ *		- several comments rephrased and new ones added;
+ *		- make compiler not complain about 'credits' defined but
+ *		  not used;
+ */
+/* ============================================= */
+/* NO USER SERVICABLE PARTS FOLLOWING THIS POINT */
+/* ============================================= */
+
+#define PORTABLE_SNPRINTF_VERSION_MAJOR 2
+#define PORTABLE_SNPRINTF_VERSION_MINOR 2
+#include <sys/types.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <assert.h>
+#include <errno.h>
+#ifdef isdigit
+#undef isdigit
+#endif
+#define isdigit(c) ((c) >= '0' && (c) <= '9')
+
+#ifndef breakeven_point
+#  define breakeven_point   6	/* some reasonable one-size-fits-all value */
+#endif
+
+#define fast_memcpy(d,s,n) \
+{ register size_t nn = (size_t)(n); \
+    if (nn >= breakeven_point) memcpy((d), (s), nn); \
+    else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
+	register char *dd; register const char *ss; \
+for (ss=(s), dd=(d); nn>0; nn--) *dd++ = *ss++; } }
+
+#define fast_memset(d,c,n) \
+{ register size_t nn = (size_t)(n); \
+    if (nn >= breakeven_point) memset((d), (int)(c), nn); \
+    else if (nn > 0) { /* proc call overhead is worth only for large strings*/\
+	register char *dd; register const int cc=(int)(c); \
+for (dd=(d); nn>0; nn--) *dd++ = cc; } }
+
+
+/* declarations */
+
+static char credits[] = "\n\
+@(#)snprintf.c, v2.2: Mark Martinec, <mark.martinec at ijs.si>\n\
+@(#)snprintf.c, v2.2: Copyright 1999, Mark Martinec. Frontier Artistic License applies.\n\
+@(#)snprintf.c, v2.2: http://www.ijs.si/software/snprintf/\n";
+int symbian_vsnprintf(char *str, size_t str_m, const char *fmt, va_list ap) {
+	
+	size_t str_l = 0;
+	const char *p = fmt;
+	
+	/* In contrast with POSIX, the ISO C99 now says
+	* that str can be NULL and str_m can be 0.
+	* This is more useful than the old:  if (str_m < 1) return -1; */
+	
+	if (!p) p = "";
+	while (*p) {
+		if (*p != '%') {
+			/* if (str_l < str_m) str[str_l++] = *p++;    -- this would be sufficient */
+			/* but the following code achieves better performance for cases
+			* where format string is long and contains few conversions */
+			const char *q = strchr(p+1,'%');
+			size_t n = !q ? strlen(p) : (q-p);
+			if (str_l < str_m) {
+				size_t avail = str_m-str_l;
+				fast_memcpy(str+str_l, p, (n>avail?avail:n));
+			}
+			p += n; str_l += n;
+		} else {
+			const char *starting_p;
+			size_t min_field_width = 0, precision = 0;
+			int zero_padding = 0, precision_specified = 0, justify_left = 0;
+			int alternate_form = 0, force_sign = 0;
+			int space_for_positive = 1; /* If both the ' ' and '+' flags appear,
+			the ' ' flag should be ignored. */
+			char length_modifier = '\0';            /* allowed values: \0, h, l, L */
+			char tmp[32];/* temporary buffer for simple numeric->string conversion */
+			
+			const char *str_arg;      /* string address in case of string argument */
+									  size_t str_arg_l;         /* natural field width of arg without padding
+									  and sign */
+									  unsigned char uchar_arg;
+									  /* unsigned char argument value - only defined for c conversion.
+									  N.B. standard explicitly states the char argument for
+									  the c conversion is unsigned */
+									  
+									  size_t number_of_zeros_to_pad = 0;
+									  /* number of zeros to be inserted for numeric conversions
+									  as required by the precision or minimal field width */
+									  
+									  size_t zero_padding_insertion_ind = 0;
+									  /* index into tmp where zero padding is to be inserted */
+									  
+									  char fmt_spec = '\0';
+									  /* current conversion specifier character */
+									  
+									  str_arg = credits;/* just to make compiler happy (defined but not used)*/
+									  str_arg = NULL;
+									  starting_p = p; p++;  /* skip '%' */
+									  /* parse flags */
+									  while (*p == '0' || *p == '-' || *p == '+' ||
+										  *p == ' ' || *p == '#' || *p == '\'') {
+										  switch (*p) {
+										  case '0': zero_padding = 1; break;
+										  case '-': justify_left = 1; break;
+										  case '+': force_sign = 1; space_for_positive = 0; break;
+										  case ' ': force_sign = 1;
+											  /* If both the ' ' and '+' flags appear, the ' ' flag should be ignored */
+											  break;
+										  case '#': alternate_form = 1; break;
+										  case '\'': break;
+										  }
+										  p++;
+									  }
+									  /* If the '0' and '-' flags both appear, the '0' flag should be ignored. */
+									  
+									  /* parse field width */
+									  if (*p == '*') {
+										  int j;
+										  p++; j = va_arg(ap, int);
+										  if (j >= 0) min_field_width = j;
+										  else { min_field_width = -j; justify_left = 1; }
+									  } else if (isdigit((int)(*p))) {
+									  /* size_t could be wider than unsigned int;
+										  make sure we treat argument like common implementations do */
+										  unsigned int uj = *p++ - '0';
+										  while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0');
+										  min_field_width = uj;
+									  }
+									  /* parse precision */
+									  if (*p == '.') {
+										  p++; precision_specified = 1;
+										  if (*p == '*') {
+											  int j = va_arg(ap, int);
+											  p++;
+											  if (j >= 0) precision = j;
+											  else {
+												  precision_specified = 0; precision = 0;
+												  /* NOTE:
+												  *   Solaris 2.6 man page claims that in this case the precision
+												  *   should be set to 0.  Digital Unix 4.0, HPUX 10 and BSD man page
+												  *   claim that this case should be treated as unspecified precision,
+												  *   which is what we do here.
+												  */
+											  }
+										  } else if (isdigit((int)(*p))) {
+										  /* size_t could be wider than unsigned int;
+											  make sure we treat argument like common implementations do */
+											  unsigned int uj = *p++ - '0';
+											  while (isdigit((int)(*p))) uj = 10*uj + (unsigned int)(*p++ - '0');
+											  precision = uj;
+										  }
+									  }
+									  /* parse 'h', 'l' and 'll' length modifiers */
+									  if (*p == 'h' || *p == 'l') {
+										  length_modifier = *p; p++;
+										  if (length_modifier == 'l' && *p == 'l') {   /* double l = long long */
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+											  length_modifier = '2';                  /* double l encoded as '2' */
+#else
+											  length_modifier = 'l';                 /* treat it as a single 'l' */
+#endif
+											  p++;
+										  }
+									  }
+									  fmt_spec = *p;
+									  /* common synonyms: */
+									  switch (fmt_spec) {
+									  case 'i': fmt_spec = 'd'; break;
+									  case 'D': fmt_spec = 'd'; length_modifier = 'l'; break;
+									  case 'U': fmt_spec = 'u'; length_modifier = 'l'; break;
+									  case 'O': fmt_spec = 'o'; length_modifier = 'l'; break;
+									  default: break;
+									  }
+									  /* get parameter value, do initial processing */
+									  switch (fmt_spec) {
+									  case '%': /* % behaves similar to 's' regarding flags and field widths */
+									  case 'c': /* c behaves similar to 's' regarding flags and field widths */
+									  case 's':
+										  length_modifier = '\0';          /* wint_t and wchar_t not supported */
+										  /* the result of zero padding flag with non-numeric conversion specifier*/
+										  /* is undefined. Solaris and HPUX 10 does zero padding in this case,    */
+										  /* Digital Unix and Linux does not. */
+										  zero_padding = 0;    /* turn zero padding off for string conversions */
+										  str_arg_l = 1;
+										  switch (fmt_spec) {
+										  case '%':
+											  str_arg = p; break;
+										  case 'c': {
+											  int j = va_arg(ap, int);
+											  uchar_arg = (unsigned char) j;   /* standard demands unsigned char */
+											  str_arg = (const char *) &uchar_arg;
+											  break;
+													}
+										  case 's':
+											  str_arg = va_arg(ap, const char *);
+											  if (!str_arg) str_arg_l = 0;
+											  /* make sure not to address string beyond the specified precision !!! */
+											  else if (!precision_specified) str_arg_l = strlen(str_arg);
+											  /* truncate string if necessary as requested by precision */
+											  else if (precision == 0) str_arg_l = 0;
+											  else {
+												  /* memchr on HP does not like n > 2^31  !!! */
+												  const char *q = (const char*) memchr(str_arg, '\0',
+													  precision <= 0x7fffffff ? precision : 0x7fffffff);
+												  str_arg_l = !q ? precision : (q-str_arg);
+											  }
+											  break;
+										  default: break;
+										  }
+										  break;
+										  case 'd': case 'u': case 'o': case 'x': case 'X': case 'p': {
+										  /* NOTE: the u, o, x, X and p conversion specifiers imply
+											  the value is unsigned;  d implies a signed value */
+											  
+											  int arg_sign = 0;
+											  /* 0 if numeric argument is zero (or if pointer is NULL for 'p'),
+											  +1 if greater than zero (or nonzero for unsigned arguments),
+											  -1 if negative (unsigned argument is never negative) */
+											  
+											  int int_arg = 0;  unsigned int uint_arg = 0;
+											  /* only defined for length modifier h, or for no length modifiers */
+											  
+											  long int long_arg = 0;  unsigned long int ulong_arg = 0;
+											  /* only defined for length modifier l */
+											  
+											  void *ptr_arg = NULL;
+											  /* pointer argument value -only defined for p conversion */
+											  
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+											  long long int long_long_arg = 0;
+											  unsigned long long int ulong_long_arg = 0;
+											  /* only defined for length modifier ll */
+#endif
+											  if (fmt_spec == 'p') {
+											  /* HPUX 10: An l, h, ll or L before any other conversion character
+											  *   (other than d, i, u, o, x, or X) is ignored.
+											  * Digital Unix:
+											  *   not specified, but seems to behave as HPUX does.
+											  * Solaris: If an h, l, or L appears before any other conversion
+											  *   specifier (other than d, i, u, o, x, or X), the behavior
+											  *   is undefined. (Actually %hp converts only 16-bits of address
+											  *   and %llp treats address as 64-bit data which is incompatible
+											  *   with (void *) argument on a 32-bit system).
+												  */
+												  length_modifier = '\0';
+												  ptr_arg = va_arg(ap, void *);
+												  if (ptr_arg != NULL) arg_sign = 1;
+											  } else if (fmt_spec == 'd') {  /* signed */
+												  switch (length_modifier) {
+												  case '\0':
+												  case 'h':
+												  /* It is non-portable to specify a second argument of char or short
+												  * to va_arg, because arguments seen by the called function
+												  * are not char or short.  C converts char and short arguments
+												  * to int before passing them to a function.
+													  */
+													  int_arg = va_arg(ap, int);
+													  if      (int_arg > 0) arg_sign =  1;
+													  else if (int_arg < 0) arg_sign = -1;
+													  break;
+												  case 'l':
+													  long_arg = va_arg(ap, long int);
+													  if      (long_arg > 0) arg_sign =  1;
+													  else if (long_arg < 0) arg_sign = -1;
+													  break;
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+												  case '2':
+													  long_long_arg = va_arg(ap, long long int);
+													  if      (long_long_arg > 0) arg_sign =  1;
+													  else if (long_long_arg < 0) arg_sign = -1;
+													  break;
+#endif
+												  }
+											  } else {  /* unsigned */
+												  switch (length_modifier) {
+												  case '\0':
+												  case 'h':
+													  uint_arg = va_arg(ap, unsigned int);
+													  if (uint_arg) arg_sign = 1;
+													  break;
+												  case 'l':
+													  ulong_arg = va_arg(ap, unsigned long int);
+													  if (ulong_arg) arg_sign = 1;
+													  break;
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+												  case '2':
+													  ulong_long_arg = va_arg(ap, unsigned long long int);
+													  if (ulong_long_arg) arg_sign = 1;
+													  break;
+#endif
+												  }
+											  }
+											  str_arg = tmp; str_arg_l = 0;
+											  /* NOTE:
+											  *   For d, i, u, o, x, and X conversions, if precision is specified,
+											  *   the '0' flag should be ignored. This is so with Solaris 2.6,
+											  *   Digital UNIX 4.0, HPUX 10, Linux, FreeBSD, NetBSD; but not with Perl.
+											  */
+											  if (precision_specified) zero_padding = 0;
+											  if (fmt_spec == 'd') {
+												  if (force_sign && arg_sign >= 0)
+													  tmp[str_arg_l++] = space_for_positive ? ' ' : '+';
+													  /* leave negative numbers for sprintf to handle,
+												  to avoid handling tricky cases like (short int)(-32768) */
+											  } else if (alternate_form) {
+												  if (arg_sign != 0 && (fmt_spec == 'x' || fmt_spec == 'X') )
+												  { tmp[str_arg_l++] = '0'; tmp[str_arg_l++] = fmt_spec; }
+												  /* alternate form should have no effect for p conversion, but ... */
+											  }
+											  zero_padding_insertion_ind = str_arg_l;
+											  if (!precision_specified) precision = 1;   /* default precision is 1 */
+											  if (precision == 0 && arg_sign == 0
+												  ) {
+												  /* converted to null string */
+												  /* When zero value is formatted with an explicit precision 0,
+												  the resulting formatted string is empty (d, i, u, o, x, X, p).   */
+											  } else {
+												  char f[5]; int f_l = 0;
+												  f[f_l++] = '%';    /* construct a simple format string for sprintf */
+												  if (!length_modifier) { }
+												  else if (length_modifier=='2') { f[f_l++] = 'l'; f[f_l++] = 'l'; }
+												  else f[f_l++] = length_modifier;
+												  f[f_l++] = fmt_spec; f[f_l++] = '\0';
+												  if (fmt_spec == 'p') str_arg_l += sprintf(tmp+str_arg_l, f, ptr_arg);
+												  else if (fmt_spec == 'd') {  /* signed */
+													  switch (length_modifier) {
+													  case '\0':
+													  case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, int_arg);  break;
+													  case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, long_arg); break;
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+													  case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,long_long_arg); break;
+#endif
+													  }
+												  } else {  /* unsigned */
+													  switch (length_modifier) {
+													  case '\0':
+													  case 'h': str_arg_l+=sprintf(tmp+str_arg_l, f, uint_arg);  break;
+													  case 'l': str_arg_l+=sprintf(tmp+str_arg_l, f, ulong_arg); break;
+#ifdef SNPRINTF_LONGLONG_SUPPORT
+													  case '2': str_arg_l+=sprintf(tmp+str_arg_l,f,ulong_long_arg);break;
+#endif
+													  }
+												  }
+												  /* include the optional minus sign and possible "0x"
+												  in the region before the zero padding insertion point */
+												  if (zero_padding_insertion_ind < str_arg_l &&
+													  tmp[zero_padding_insertion_ind] == '-') {
+													  zero_padding_insertion_ind++;
+												  }
+												  if (zero_padding_insertion_ind+1 < str_arg_l &&
+													  tmp[zero_padding_insertion_ind]   == '0' &&
+													  (tmp[zero_padding_insertion_ind+1] == 'x' ||
+													  tmp[zero_padding_insertion_ind+1] == 'X') ) {
+													  zero_padding_insertion_ind += 2;
+												  }
+											  }
+											  { size_t num_of_digits = str_arg_l - zero_padding_insertion_ind;
+											  if (alternate_form && fmt_spec == 'o'
+												  /* unless zero is already the first character */
+												  && !(zero_padding_insertion_ind < str_arg_l
+												  && tmp[zero_padding_insertion_ind] == '0')
+												  ) {        /* assure leading zero for alternate-form octal numbers */
+												  if (!precision_specified || precision < num_of_digits+1) {
+												  /* precision is increased to force the first character to be zero,
+												  except if a zero value is formatted with an explicit precision
+													  of zero */
+													  precision = num_of_digits+1; precision_specified = 1;
+												  }
+											  }
+											  /* zero padding to specified precision? */
+											  if (num_of_digits < precision) 
+												  number_of_zeros_to_pad = precision - num_of_digits;
+											  }
+											  /* zero padding to specified minimal field width? */
+											  if (!justify_left && zero_padding) {
+												  int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
+												  if (n > 0) number_of_zeros_to_pad += n;
+											  }
+											  break;
+      }
+      default: /* unrecognized conversion specifier, keep format string as-is*/
+		  zero_padding = 0;  /* turn zero padding off for non-numeric convers. */
+		  justify_left = 1; min_field_width = 0;                /* reset flags */
+																/* discard the unrecognized conversion, just keep *
+		  * the unrecognized conversion character          */
+		  str_arg = p; str_arg_l = 0;
+		  if (*p) str_arg_l++;  /* include invalid conversion specifier unchanged
+		  if not at end-of-string */
+		  break;
+      }
+      if (*p) p++;      /* step over the just processed conversion specifier */
+						/* insert padding to the left as requested by min_field_width;
+      this does not include the zero padding in case of numerical conversions*/
+      if (!justify_left) {                /* left padding with blank or zero */
+		  int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
+		  if (n > 0) {
+			  if (str_l < str_m) {
+				  size_t avail = str_m-str_l;
+				  fast_memset(str+str_l, (zero_padding?'0':' '), (n>avail?avail:n));
+			  }
+			  str_l += n;
+		  }
+      }
+	  /* zero padding as requested by the precision or by the minimal field width
+	  * for numeric conversions required? */
+      if (number_of_zeros_to_pad <= 0) {
+	  /* will not copy first part of numeric right now, *
+		  * force it to be copied later in its entirety    */
+		  zero_padding_insertion_ind = 0;
+      } else {
+		  /* insert first part of numerics (sign or '0x') before zero padding */
+		  int n = zero_padding_insertion_ind;
+		  if (n > 0) {
+			  if (str_l < str_m) {
+				  size_t avail = str_m-str_l;
+				  fast_memcpy(str+str_l, str_arg, (n>avail?avail:n));
+			  }
+			  str_l += n;
+		  }
+		  /* insert zero padding as requested by the precision or min field width */
+		  n = number_of_zeros_to_pad;
+		  if (n > 0) {
+			  if (str_l < str_m) {
+				  size_t avail = str_m-str_l;
+				  fast_memset(str+str_l, '0', (n>avail?avail:n));
+			  }
+			  str_l += n;
+		  }
+      }
+	  /* insert formatted string
+	  * (or as-is conversion specifier for unknown conversions) */
+      { int n = str_arg_l - zero_padding_insertion_ind;
+	  if (n > 0) {
+          if (str_l < str_m) {
+			  size_t avail = str_m-str_l;
+			  fast_memcpy(str+str_l, str_arg+zero_padding_insertion_ind,
+				  (n>avail?avail:n));
+          }
+          str_l += n;
+	  }
+      }
+	  /* insert right padding */
+      if (justify_left) {          /* right blank padding to the field width */
+		  int n = min_field_width - (str_arg_l+number_of_zeros_to_pad);
+		  if (n > 0) {
+			  if (str_l < str_m) {
+				  size_t avail = str_m-str_l;
+				  fast_memset(str+str_l, ' ', (n>avail?avail:n));
+			  }
+			  str_l += n;
+		  }
+      }
+    }
+  }
+  if (str_m > 0) { /* make sure the string is null-terminated
+				   even at the expense of overwriting the last character
+	  (shouldn't happen, but just in case) */
+	  str[str_l <= str_m-1 ? str_l : str_m-1] = '\0';
+  }
+  /* Return the number of characters formatted (excluding trailing null
+  * character), that is, the number of characters that would have been
+  * written to the buffer if it were large enough.
+  *
+  * The value of str_l should be returned, but str_l is of unsigned type
+  * size_t, and snprintf is int, possibly leading to an undetected
+  * integer overflow, resulting in a negative return value, which is illegal.
+  * Both XSH5 and ISO C99 (at least the draft) are silent on this issue.
+  * Should errno be set to EOVERFLOW and EOF returned in this case???
+  */
+  return (int) str_l;
+}
+
+int symbian_snprintf(char *text, size_t maxlen, const char *fmt, ...) {
+	va_list ap;
+	int retval;
+	
+	va_start(ap, fmt);
+	retval = symbian_vsnprintf(text, maxlen, fmt, ap);
+	va_end(ap);
+	
+	return retval;
+}


Property changes on: scummvm/trunk/backends/platform/symbian/src/vsnprintf.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list