diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/parser/scansup.c | 16 | ||||
| -rw-r--r-- | src/backend/utils/error/elog.c | 4 |
2 files changed, 15 insertions, 5 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': |