firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 08:03:03 +01:00
Code Issues

Solaris port

Browse Source
This commit is contained in:
alexpeshkoff 2009-01-04 17:46:16 +00:00
parent 9d52bb0384
commit 7757c6b8cb
2 changed files with 62 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/isql/isql.epp
View File

@ -64,6 +64,10 @@
#include "../common/classes/ClumpletWriter.h" #include "../common/classes/ClumpletWriter.h"
#include "../common/classes/TempFile.h" #include "../common/classes/TempFile.h"
#ifdef SOLARIS
#include <nan.h>
#endif
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -7066,6 +7070,39 @@ static processing_state passthrough(const char* cmd)
} }
#endif #endif
static bool checkSpecial(TEXT* const p, const int length, const double value)
{
/**************************************
*
* c h e c k S p e c i a l
*
**************************************
*
* Functional description
* Special case - Nan and Infinity.
* Some libraries (SFIO) work wrong with them.
*
**************************************/
const TEXT* t = NULL;
#ifdef SOLARIS
if (IsNANorINF(value))
{
t = IsINF(value) ? "Infinity" : "NaN";
}
#endif
if (! t)
{
return false;
}
if (List) {
isqlGlob.printf("%s%s", t, NEWLINE);
}
sprintf(p, "%*.*s ", length, length, t);
return true;
}
static SSHORT print_item(TEXT** s, static SSHORT print_item(TEXT** s,
XSQLVAR* var, XSQLVAR* var,
@ -7215,6 +7252,12 @@ static SSHORT print_item(TEXT** s,
// The bug appears in TCS DSQL_DOMAIN_12 and 13 // The bug appears in TCS DSQL_DOMAIN_12 and 13
// //
const double value = (double) *(float*) var->sqldata; const double value = (double) *(float*) var->sqldata;
if (checkSpecial(p, length, value))
{
break;
}
#if defined(MINGW) #if defined(MINGW)
if (value == 0) { if (value == 0) {
sprintf(p, "% #*.*g ", length, sprintf(p, "% #*.*g ", length,
@ -7248,6 +7291,12 @@ static SSHORT print_item(TEXT** s,
case SQL_DOUBLE: case SQL_DOUBLE:
{ {
const double value = *(double*) var->sqldata; const double value = *(double*) var->sqldata;
if (checkSpecial(p, length, value))
{
break;
}
// Don't let numeric/decimal doubles overflow print length // Don't let numeric/decimal doubles overflow print length
// Special handling for 0 -- don't test log for length // Special handling for 0 -- don't test log for length
int rounded = 0; int rounded = 0;

13
src/qli/picstr.cpp
View File

@ -24,6 +24,11 @@
#include "firebird.h" #include "firebird.h"
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#ifdef SOLARIS
#include <nan.h>
#endif
#include "../qli/dtr.h" #include "../qli/dtr.h"
#include "../qli/exe.h" #include "../qli/exe.h"
#include "../qli/format.h" #include "../qli/format.h"
@ -717,6 +722,14 @@ static void edit_float( const dsc* desc, pics* picture, TEXT** output)
number = -number; number = -number;
} }
#ifdef SOLARIS
if (IsNANorINF(number))
{
sprintf(temp, IsINF(number) ? "Infinity" : "NaN");
}
else
#endif
/* If exponents are explicitly requested (E-format edit_string), generate them. /* If exponents are explicitly requested (E-format edit_string), generate them.
Otherwise, the rules are: if the number in f-format will fit into the allotted Otherwise, the rules are: if the number in f-format will fit into the allotted
space, print it in f-format; otherwise print it in e-format. space, print it in f-format; otherwise print it in e-format.