database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix signed integer problems in vxprintf. Ticket #778. Also remove some

Browse Source 
dead code from util.c. (CVS 1685)

FossilOrigin-Name: 200cd3baf60e6cfad9fa3971834367821456ae30
This commit is contained in:
drh
2004-06-25 01:10:48 +00:00
parent 256a4ec4a3
commit e970767144
6 changed files with 94 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/printf.c
View File

@@ -345,35 +345,27 @@ static int vxprintf(
*/
switch( xtype ){
case etRADIX:
if( flag_longlong ) longvalue = va_arg(ap,sqlite_int64);
else if( flag_long ) longvalue = va_arg(ap,long int);
else longvalue = va_arg(ap,int);
#if 1
/* For the format %#x, the value zero is printed "0" not "0x0".
** I think this is stupid. */
if( longvalue==0 ) flag_alternateform = 0;
#else
/* More sensible: turn off the prefix for octal (to prevent "00"),
** but leave the prefix for hex. */
if( longvalue==0 && infop->base==8 ) flag_alternateform = 0;
#endif
if( infop->flags & FLAG_SIGNED ){
if( flag_longlong ){
if( *(i64*)&longvalue<0 ){
longvalue = -*(i64*)&longvalue;
prefix = '-';
}else if( flag_plussign ) prefix = '+';
else if( flag_blanksign ) prefix = ' ';
else prefix = 0;
i64 v;
if( flag_longlong ) v = va_arg(ap,i64);
else if( flag_long ) v = va_arg(ap,long int);
else v = va_arg(ap,int);
if( v<0 ){
longvalue = -v;
prefix = '-';
}else{
if( *(long*)&longvalue<0 ){
longvalue = -*(long*)&longvalue;
prefix = '-';
}else if( flag_plussign ) prefix = '+';
longvalue = v;
if( flag_plussign ) prefix = '+';
else if( flag_blanksign ) prefix = ' ';
else prefix = 0;
}
}else prefix = 0;
}else{
if( flag_longlong ) longvalue = va_arg(ap,u64);
else if( flag_long ) longvalue = va_arg(ap,unsigned long int);
else longvalue = va_arg(ap,unsigned int);
prefix = 0;
}
if( longvalue==0 ) flag_alternateform = 0;
if( flag_zeropad && precision<width-(prefix!=0) ){
precision = width-(prefix!=0);
}

178
src/test1.c
View File

@@ -13,7 +13,7 @@
** is not included in the SQLite library. It is used for automated
** testing of the SQLite library.
**
** $Id: test1.c,v 1.86 2004/06/23 12:35:15 danielk1977 Exp $
** $Id: test1.c,v 1.87 2004/06/25 01:10:48 drh Exp $
*/
#include "sqliteInt.h"
#include "tcl.h"
@@ -539,6 +539,37 @@ static int sqlite3_mprintf_int(
return TCL_OK;
}
/*
** Usage: sqlite3_mprintf_int64 FORMAT INTEGER INTEGER INTEGER
**
** Call mprintf with three 64-bit integer arguments
*/
static int sqlite3_mprintf_int64(
void *NotUsed,
Tcl_Interp *interp, /* The TCL interpreter that invoked this command */
int argc, /* Number of arguments */
char **argv /* Text of each argument */
){
int i;
sqlite_int64 a[3];
char *z;
if( argc!=5 ){
Tcl_AppendResult(interp, "wrong # args: should be \"", argv[0],
" FORMAT INT INT INT\"", 0);
return TCL_ERROR;
}
for(i=2; i<5; i++){
if( !sqlite3GetInt64(argv[i], &a[i-2]) ){
Tcl_AppendResult(interp, "argument is not a valid 64-bit integer", 0);
return TCL_ERROR;
}
}
z = sqlite3_mprintf(argv[1], a[0], a[1], a[2]);
Tcl_AppendResult(interp, z, 0);
sqlite3_free(z);
return TCL_OK;
}
/*
** Usage: sqlite3_mprintf_str FORMAT INTEGER INTEGER STRING
**
@@ -984,153 +1015,24 @@ bad_args:
return TCL_ERROR;
}
/*
** Usage: add_test_function <db ptr> <utf8> <utf16le> <utf16be>
**
** This function is used to test that SQLite selects the correct user
** function callback when multiple versions (for different text encodings)
** are available.
**
** Calling this routine registers up to three versions of the user function
** "test_function" with database handle <db>. If the second argument is
** true, then a version of test_function is registered for UTF-8, if the
** third is true, a version is registered for UTF-16le, if the fourth is
** true, a UTF-16be version is available. Previous versions of
** test_function are deleted.
**
** The user function is implemented by calling the following TCL script:
**
** "test_function <enc> <arg>"
**
** Where <enc> is one of UTF-8, UTF-16LE or UTF16BE, and <arg> is the
** single argument passed to the SQL function. The value returned by
** the TCL script is used as the return value of the SQL function. It
** is passed to SQLite using UTF-16BE for a UTF-8 test_function(), UTF-8
** for a UTF-16LE test_function(), and UTF-16LE for an implementation that
** prefers UTF-16BE.
*/
static void test_function_utf8(
sqlite3_context *pCtx,
int nArg,
sqlite3_value **argv
){
Tcl_Interp *interp;
Tcl_Obj *pX;
sqlite3_value *pVal;
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
pX = Tcl_NewStringObj("test_function", -1);
Tcl_IncrRefCount(pX);
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-8", -1));
Tcl_ListObjAppendElement(interp, pX,
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
Tcl_EvalObjEx(interp, pX, 0);
Tcl_DecrRefCount(pX);
sqlite3_result_text(pCtx, Tcl_GetStringResult(interp), -1, SQLITE_TRANSIENT);
pVal = sqlite3ValueNew();
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
SQLITE_UTF8, SQLITE_STATIC);
sqlite3_result_text16be(pCtx, sqlite3_value_text16be(pVal),
-1, SQLITE_TRANSIENT);
sqlite3ValueFree(pVal);
}
static void test_function_utf16le(
sqlite3_context *pCtx,
int nArg,
sqlite3_value **argv
){
Tcl_Interp *interp;
Tcl_Obj *pX;
sqlite3_value *pVal;
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
pX = Tcl_NewStringObj("test_function", -1);
Tcl_IncrRefCount(pX);
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16LE", -1));
Tcl_ListObjAppendElement(interp, pX,
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
Tcl_EvalObjEx(interp, pX, 0);
Tcl_DecrRefCount(pX);
pVal = sqlite3ValueNew();
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
SQLITE_UTF8, SQLITE_STATIC);
sqlite3_result_text(pCtx,sqlite3_value_text(pVal),-1,SQLITE_TRANSIENT);
sqlite3ValueFree(pVal);
}
static void test_function_utf16be(
sqlite3_context *pCtx,
int nArg,
sqlite3_value **argv
){
Tcl_Interp *interp;
Tcl_Obj *pX;
sqlite3_value *pVal;
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
pX = Tcl_NewStringObj("test_function", -1);
Tcl_IncrRefCount(pX);
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16BE", -1));
Tcl_ListObjAppendElement(interp, pX,
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
Tcl_EvalObjEx(interp, pX, 0);
Tcl_DecrRefCount(pX);
pVal = sqlite3ValueNew();
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
SQLITE_UTF8, SQLITE_STATIC);
sqlite3_result_text16le(pCtx, sqlite3_value_text16le(pVal),
-1, SQLITE_TRANSIENT);
sqlite3ValueFree(pVal);
}
static int test_function(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
sqlite3 *db;
int val;
if( objc!=5 ) goto bad_args;
if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[2], &val) ) return TCL_ERROR;
if( val ){
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF8,
interp, test_function_utf8, 0, 0);
}
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[3], &val) ) return TCL_ERROR;
if( val ){
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF16LE,
interp, test_function_utf16le, 0, 0);
}
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[4], &val) ) return TCL_ERROR;
if( val ){
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF16BE,
interp, test_function_utf16be, 0, 0);
}
return TCL_OK;
bad_args:
Tcl_AppendResult(interp, "wrong # args: should be \"",
Tcl_GetStringFromObj(objv[0], 0), " <DB> <utf8> <utf16le> <utf16be>", 0);
return TCL_ERROR;
}
static int sqlite3_crashparams(
static int sqlite3_crashseed(
void * clientData,
Tcl_Interp *interp,
int objc,
Tcl_Obj *CONST objv[]
){
#ifdef OS_TEST
int delay;
if( objc!=3 ) goto bad_args;
if( Tcl_GetIntFromObj(interp, objv[1], &delay) ) return TCL_ERROR;
sqlite3SetCrashParams(delay, Tcl_GetString(objv[2]));
int seed;
if( objc!=2 ) goto bad_args;
if( Tcl_GetIntFromObj(interp, objv[1], &seed) ) return TCL_ERROR;
sqlite3SetCrashseed(seed);
#endif
return TCL_OK;
#ifdef OS_TEST
bad_args:
Tcl_AppendResult(interp, "wrong # args: should be \"",
Tcl_GetStringFromObj(objv[0], 0), "<delay> <filename>", 0);
Tcl_GetStringFromObj(objv[0], 0), "<seed>", 0);
return TCL_ERROR;
#endif
}
@@ -2130,6 +2032,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
Tcl_CmdProc *xProc;
} aCmd[] = {
{ "sqlite3_mprintf_int", (Tcl_CmdProc*)sqlite3_mprintf_int },
{ "sqlite3_mprintf_int64", (Tcl_CmdProc*)sqlite3_mprintf_int64 },
{ "sqlite3_mprintf_str", (Tcl_CmdProc*)sqlite3_mprintf_str },
{ "sqlite3_mprintf_double", (Tcl_CmdProc*)sqlite3_mprintf_double },
{ "sqlite3_mprintf_scaled", (Tcl_CmdProc*)sqlite3_mprintf_scaled },
@@ -2197,8 +2100,7 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
{ "sqlite3OsLock", test_sqlite3OsLock, 0 },
{ "sqlite3OsUnlock", test_sqlite3OsUnlock, 0 },
{ "add_test_collate", test_collate, 0 },
{ "add_test_function", test_function, 0 },
{ "sqlite3_crashparams", sqlite3_crashparams, 0 },
{ "sqlite3_crashseed", sqlite3_crashseed, 0 },
};
int i;

148
src/util.c
View File

@@ -14,7 +14,7 @@
** This file contains functions for allocating memory, comparing
** strings, and stuff like that.
**
** $Id: util.c,v 1.106 2004/06/21 08:18:55 danielk1977 Exp $
** $Id: util.c,v 1.107 2004/06/25 01:10:48 drh Exp $
*/
#include "sqliteInt.h"
#include <stdarg.h>
@@ -774,152 +774,6 @@ int sqlite3GetInt64(const char *zNum, i64 *pValue){
return 0;
}
/* This comparison routine is what we use for comparison operations
** between numeric values in an SQL expression. "Numeric" is a little
** bit misleading here. What we mean is that the strings have a
** type of "numeric" from the point of view of SQL. The strings
** do not necessarily contain numbers. They could contain text.
**
** If the input strings both look like actual numbers then they
** compare in numerical order. Numerical strings are always less
** than non-numeric strings so if one input string looks like a
** number and the other does not, then the one that looks like
** a number is the smaller. Non-numeric strings compare in
** lexigraphical order (the same order as strcmp()).
*/
int sqlite3Compare(const char *atext, const char *btext){
int result;
int isNumA, isNumB;
if( atext==0 ){
return -1;
}else if( btext==0 ){
return 1;
}
isNumA = sqlite3IsNumber(atext, 0, SQLITE_UTF8);
isNumB = sqlite3IsNumber(btext, 0, SQLITE_UTF8);
if( isNumA ){
if( !isNumB ){
result = -1;
}else{
double rA, rB;
rA = sqlite3AtoF(atext, 0);
rB = sqlite3AtoF(btext, 0);
if( rA<rB ){
result = -1;
}else if( rA>rB ){
result = +1;
}else{
result = 0;
}
}
}else if( isNumB ){
result = +1;
}else {
result = strcmp(atext, btext);
}
return result;
}
/*
** This routine is used for sorting. Each key is a list of one or more
** null-terminated elements. The list is terminated by two nulls in
** a row. For example, the following text is a key with three elements
**
** Aone\000Dtwo\000Athree\000\000
**
** All elements begin with one of the characters "+-AD" and end with "\000"
** with zero or more text elements in between. Except, NULL elements
** consist of the special two-character sequence "N\000".
**
** Both arguments will have the same number of elements. This routine
** returns negative, zero, or positive if the first argument is less
** than, equal to, or greater than the first. (Result is a-b).
**
** Each element begins with one of the characters "+", "-", "A", "D".
** This character determines the sort order and collating sequence:
**
** + Sort numerically in ascending order
** - Sort numerically in descending order
** A Sort as strings in ascending order
** D Sort as strings in descending order.
**
** For the "+" and "-" sorting, pure numeric strings (strings for which the
** isNum() function above returns TRUE) always compare less than strings
** that are not pure numerics. Non-numeric strings compare in memcmp()
** order. This is the same sort order as the sqlite3Compare() function
** above generates.
**
** The last point is a change from version 2.6.3 to version 2.7.0. In
** version 2.6.3 and earlier, substrings of digits compare in numerical
** and case was used only to break a tie.
**
** Elements that begin with 'A' or 'D' compare in memcmp() order regardless
** of whether or not they look like a number.
**
** Note that the sort order imposed by the rules above is the same
** from the ordering defined by the "<", "<=", ">", and ">=" operators
** of expressions and for indices. This was not the case for version
** 2.6.3 and earlier.
*/
int sqlite3SortCompare(const char *a, const char *b){
int res = 0;
int isNumA, isNumB;
int dir = 0;
while( res==0 && *a && *b ){
if( a[0]=='N' || b[0]=='N' ){
if( a[0]==b[0] ){
a += 2;
b += 2;
continue;
}
if( a[0]=='N' ){
dir = b[0];
res = -1;
}else{
dir = a[0];
res = +1;
}
break;
}
assert( a[0]==b[0] );
if( (dir=a[0])=='A' || a[0]=='D' ){
res = strcmp(&a[1],&b[1]);
if( res ) break;
}else{
isNumA = sqlite3IsNumber(&a[1], 0, SQLITE_UTF8);
isNumB = sqlite3IsNumber(&b[1], 0, SQLITE_UTF8);
if( isNumA ){
double rA, rB;
if( !isNumB ){
res = -1;
break;
}
rA = sqlite3AtoF(&a[1], 0);
rB = sqlite3AtoF(&b[1], 0);
if( rA<rB ){
res = -1;
break;
}
if( rA>rB ){
res = +1;
break;
}
}else if( isNumB ){
res = +1;
break;
}else{
res = strcmp(&a[1],&b[1]);
if( res ) break;
}
}
a += strlen(&a[1]) + 2;
b += strlen(&b[1]) + 2;
}
if( dir=='-' || dir=='D' ) res = -res;
return res;
}
#if 1 /* We are now always UTF-8 */
/*
** X is a pointer to the first byte of a UTF-8 character. Increment