diff options
| -rw-r--r-- | src/backend/parser/scansup.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/error/elog.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-misc.c | 28 |
3 files changed, 40 insertions, 8 deletions
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c index cf588c1de8b..bc20b5a943e 100644 --- a/src/backend/parser/scansup.c +++ b/src/backend/parser/scansup.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.29 2004/12/31 22:00:27 pgsql Exp $ + * $PostgreSQL: pgsql/src/backend/parser/scansup.c,v 1.29.4.1 2010/05/08 16:40:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -177,10 +177,20 @@ truncate_identifier(char *ident, int len, bool warn) { len = pg_mbcliplen(ident, len, NAMEDATALEN - 1); if (warn) + { + /* + * Cannot use %.*s here because some machines interpret %s's + * precision in characters, others in bytes. + */ + char buf[NAMEDATALEN]; + + memcpy(buf, ident, len); + buf[len] = '\0'; ereport(NOTICE, (errcode(ERRCODE_NAME_TOO_LONG), - errmsg("identifier \"%s\" will be truncated to \"%.*s\"", - ident, len, ident))); + errmsg("identifier \"%s\" will be truncated to \"%s\"", + ident, buf))); + } ident[len] = '\0'; } } diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 6ad177e0251..821ecbb7ad2 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -42,7 +42,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.155.4.11 2009/03/03 00:17:36 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.155.4.12 2010/05/08 16:40:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1524,7 +1524,7 @@ log_line_prefix(StringInfo buf) int displen; psdisp = get_ps_display(&displen); - appendStringInfo(buf, "%.*s", displen, psdisp); + appendBinaryStringInfo(buf, psdisp, displen); } break; case 'r': diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c index 3571af7b911..d36450565dc 100644 --- a/src/interfaces/libpq/fe-misc.c +++ b/src/interfaces/libpq/fe-misc.c @@ -23,7 +23,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.112.4.1 2005/07/08 15:24:53 tgl Exp $ + * $PostgreSQL: pgsql/src/interfaces/libpq/fe-misc.c,v 1.112.4.2 2010/05/08 16:40:45 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -70,6 +70,20 @@ static int pqSocketPoll(int sock, int forRead, int forWrite, time_t end_time); /* + * fputnbytes: print exactly N bytes to a file + * + * Think not to use fprintf with a %.*s format for this. Some machines + * believe %s's precision is measured in characters, others in bytes. + */ +static void +fputnbytes(FILE *f, const char *str, size_t n) +{ + while (n-- > 0) + fputc(*str++, f); +} + + +/* * pqGetc: get 1 character from the connection * * All these routines return 0 on success, EOF on error. @@ -175,7 +189,11 @@ pqGetnchar(char *s, size_t len, PGconn *conn) conn->inCursor += len; if (conn->Pfdebug) - fprintf(conn->Pfdebug, "From backend (%lu)> %.*s\n", (unsigned long) len, (int) len, s); + { + fprintf(conn->Pfdebug, "From backend (%lu)> ", (unsigned long) len); + fputnbytes(conn->Pfdebug, s, len); + fprintf(conn->Pfdebug, "\n"); + } return 0; } @@ -191,7 +209,11 @@ pqPutnchar(const char *s, size_t len, PGconn *conn) return EOF; if (conn->Pfdebug) - fprintf(conn->Pfdebug, "To backend> %.*s\n", (int) len, s); + { + fprintf(conn->Pfdebug, "To backend> "); + fputnbytes(conn->Pfdebug, s, len); + fprintf(conn->Pfdebug, "\n"); + } return 0; } |