diff options
| author | Bruce Momjian <bruce@momjian.us> | 2005-07-02 17:01:59 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2005-07-02 17:01:59 +0000 |
| commit | 74b49a81294b2943179078272bc3413b33d16e6f (patch) | |
| tree | 1f610742e7fffbce204c4a95df8163d98bcaba6f /src/backend/utils/adt/quote.c | |
| parent | 654efe6aaa65d4bb53a3c888df1143558a1034ad (diff) | |
| download | postgresql-74b49a81294b2943179078272bc3413b33d16e6f.tar.gz postgresql-74b49a81294b2943179078272bc3413b33d16e6f.zip | |
Add E'' to internally created SQL strings that contain backslashes.
Improve code clarity by using macros for E'' processing.
Diffstat (limited to 'src/backend/utils/adt/quote.c')
| -rw-r--r-- | src/backend/utils/adt/quote.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c index 8650a0d2e86..808ae6142ed 100644 --- a/src/backend/utils/adt/quote.c +++ b/src/backend/utils/adt/quote.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/quote.c,v 1.15 2005/03/21 16:29:20 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/quote.c,v 1.16 2005/07/02 17:01:50 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -60,19 +60,25 @@ quote_literal(PG_FUNCTION_ARGS) len = VARSIZE(t) - VARHDRSZ; /* We make a worst-case result area; wasting a little space is OK */ - result = (text *) palloc(len * 2 + 2 + VARHDRSZ); + result = (text *) palloc(len * 2 + 3 + VARHDRSZ); cp1 = VARDATA(t); cp2 = VARDATA(result); + for(; len-- > 0; cp1++) + if (*cp1 == '\\') + { + *cp2++ = ESCAPE_STRING_SYNTAX; + break; + } + + len = VARSIZE(t) - VARHDRSZ; + cp1 = VARDATA(t); *cp2++ = '\''; while (len-- > 0) { - if (*cp1 == '\'') - *cp2++ = '\''; - else if (*cp1 == '\\') - *cp2++ = '\\'; - + if (SQL_STR_DOUBLE(*cp1)) + *cp2++ = *cp1; *cp2++ = *cp1++; } *cp2++ = '\''; |