mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable doubling of backslashes in PQprint, per discussion

Browse Source 
on pgsql-interfaces a couple months ago.
This commit is contained in:
Tom Lane 1998-10-04 20:46:39 +00:00
parent 280acf0904
commit 22da903a48
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/interfaces/libpq/fe-print.c
View File

@ -9,7 +9,7 @@
* didn't really belong there. * didn't really belong there.
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.12 1998/09/01 04:40:09 momjian Exp $ * $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.13 1998/10/04 20:46:39 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -548,6 +548,7 @@ do_field(PQprintOpt *po, PGresult *res,
if (!skipit) if (!skipit)
{ {
char ch = 0;
#ifdef MULTIBYTE #ifdef MULTIBYTE
int len; int len;
@ -558,18 +559,36 @@ do_field(PQprintOpt *po, PGresult *res,
for (p = pval, o = buf; *p; *(o++) = *(p++)) for (p = pval, o = buf; *p; *(o++) = *(p++))
#endif #endif
{ {
if ((fs_len == 1 && (*p == *(po->fieldSep))) || *p == '\\' || *p == '\n') ch = *p;
/*
* Consensus on pgsql-interfaces (as of Aug 1998) seems to be that
* the print functions ought not insert backslashes. If you like
* them, you can re-enable this next bit.
*/
#ifdef GRATUITOUS_BACKSLASHES
if ((fs_len == 1 && (ch == *(po->fieldSep))) ||
ch == '\\' || ch == '\n')
*(o++) = '\\'; *(o++) = '\\';
if (po->align && (*pval == 'E' || *pval == 'e' || #endif
!((*p >= '0' && *p <= '9') || if (po->align &&
*p == '.' || !((ch >= '0' && ch <= '9') ||
*p == 'E' || ch == '.' ||
*p == 'e' || ch == 'E' ||
*p == ' ' || ch == 'e' ||
*p == '-'))) ch == ' ' ||
ch == '-'))
fieldNotNum[j] = 1; fieldNotNum[j] = 1;
} }
*o = '\0'; *o = '\0';
/*
* Above loop will believe E in first column is numeric; also, we
* insist on a digit in the last column for a numeric. This test
* is still not bulletproof but it handles most cases.
*/
if (po->align &&
(*pval == 'E' || *pval == 'e' ||
!(ch >= '0' && ch <= '9')))
fieldNotNum[j] = 1;
if (!po->expanded && (po->align || po->html3)) if (!po->expanded && (po->align || po->html3))
{ {
int n = strlen(buf); int n = strlen(buf);