diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-07-22 21:58:28 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-07-22 21:58:28 +0000 |
| commit | 18a7989e1a9f207c9510a602089dc3e87e796b33 (patch) | |
| tree | 9ce798ee83bc3dd47e58d8d1ba671c5dbbaf5b09 /src/backend/utils/adt/arrayfuncs.c | |
| parent | 672f6ece2317b4a56fc1c776a1df439036c677bf (diff) | |
| download | postgresql-18a7989e1a9f207c9510a602089dc3e87e796b33.tar.gz postgresql-18a7989e1a9f207c9510a602089dc3e87e796b33.zip | |
- merging in Dr. George's tree with ours
- src/backend/access
- no changes
- src/backend/utils
- mostly cosmetic changes
- ESCAPE_PATCH Added
- src/Makefile.global changes merged
Diffstat (limited to 'src/backend/utils/adt/arrayfuncs.c')
| -rw-r--r-- | src/backend/utils/adt/arrayfuncs.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c index 8a2b0fd2910..a8f70898805 100644 --- a/src/backend/utils/adt/arrayfuncs.c +++ b/src/backend/utils/adt/arrayfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.2 1996/07/20 07:58:44 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/arrayfuncs.c,v 1.3 1996/07/22 21:56:00 scrappy Exp $ * *------------------------------------------------------------------------- */ @@ -224,6 +224,14 @@ _ArrayCount(char *str, int dim[], int typdelim) bool done = false; while (!done) { switch (*q) { +#ifdef ESCAPE_PATCH + case '\\': + /* skip escaped characters (\ and ") inside strings */ + if (scanning_string && *(q+1)) { + q++; + } + break; +#endif case '\"': scanning_string = ! scanning_string; break; |