Clarify code to double \\ and '.

bmomjian · bmomjian · commit 2f7d369a5c15 · 2005-07-01T17:40:29.000Z
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -42,7 +42,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  * Portions taken from FreeBSD.
  *
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.88 2005/06/28 15:38:12 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.89 2005/07/01 17:40:28 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1986,10 +1986,8 @@ escape_quotes(const char *src)
 	
 	for (i = 0, j = 0; i < len; i++)
 	{
-		if (src[i] == '\\')
-			result[j++] = '\\';
-		if (src[i] == '\'')		/* ANSI standard, '' */
-			result[j++] = '\'';
+		if (src[i] == '\\' || src[i] == '\'')
+			result[j++] = src[i];	/* double these */
 		result[j++] = src[i];
 	}
 	result[j] = '\0';
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.118 2005/06/26 03:03:56 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/describe.c,v 1.119 2005/07/01 17:40:28 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "describe.h"
@@ -1899,7 +1899,7 @@ processNamePattern(PQExpBuffer buf, const char *pattern,
 
 			/* Ensure chars special to string literals are passed properly */
 			if (*cp == '\'' || *cp == '\\')
-				appendPQExpBufferChar(&namebuf, *cp);
+				appendPQExpBufferChar(&namebuf, *cp);	/* double these */
 
 			i = PQmblen(cp, pset.encoding);
 			while (i--)
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2005, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.37 2005/06/14 02:57:41 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.38 2005/07/01 17:40:28 momjian Exp $
  */
 #include "postgres_fe.h"
 #include "large_obj.h"
@@ -178,7 +178,7 @@ do_lo_import(const char *filename_arg, const char *comment_arg)
 		for (i = 0; i < slen; i++)
 		{
 			if (comment_arg[i] == '\'' || comment_arg[i] == '\\')
-				*bufptr++ = '\\';
+				*bufptr++ = comment_arg[i];	/* double these */
 			*bufptr++ = comment_arg[i];
 		}
 		strcpy(bufptr, "'");
diff --git a/src/pl/plpgsql/src/gram.y b/src/pl/plpgsql/src/gram.y
@@ -4,7 +4,7 @@
  *						  procedural language
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.77 2005/06/22 01:35:02 neilc Exp $
+ *	  $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.78 2005/07/01 17:40:29 momjian Exp $
  *
  *	  This software is copyrighted by Jan Wieck - Hamburg.
  *
@@ -387,7 +387,7 @@ decl_statement	: decl_varname decl_const decl_datatype decl_notnull decl_defval
 						while (*cp1 != '\0')
 						{
 							if (*cp1 == '\\' || *cp1 == '\'')
-								*cp2++ = '\\';
+								*cp2++ = *cp1;	/* double these */
 							*cp2++ = *cp1++;
 						}
 						strcpy(cp2, "'::refcursor");

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`* Portions Copyright (c) 1994, Regents of the University of California`
`43`	`43`	`* Portions taken from FreeBSD.`
`44`	`44`	`*`
`45`		`- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.88 2005/06/28 15:38:12 tgl Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.89 2005/07/01 17:40:28 momjian Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -1986,10 +1986,8 @@ escape_quotes(const char *src)`
`1986`	`1986`
`1987`	`1987`	`for (i = 0, j = 0; i < len; i++)`
`1988`	`1988`	`{`
`1989`		`- if (src[i] == '\\')`
`1990`		`- result[j++] = '\\';`
`1991`		`- if (src[i] == '\'') /* ANSI standard, '' */`
`1992`		`- result[j++] = '\'';`
	`1989`	`+ if (src[i] == '\\' \|\| src[i] == '\'')`
	`1990`	`+ result[j++] = src[i]; /* double these */`
`1993`	`1991`	`result[j++] = src[i];`
`1994`	`1992`	`}`
`1995`	`1993`	`result[j] = '\0';`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*`
`4`	`4`	`* Copyright (c) 2000-2005, PostgreSQL Global Development Group`
`5`	`5`	`*`
`6`		`- * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.37 2005/06/14 02:57:41 momjian Exp $`
	`6`	`+ * $PostgreSQL: pgsql/src/bin/psql/large_obj.c,v 1.38 2005/07/01 17:40:28 momjian Exp $`
`7`	`7`	`*/`
`8`	`8`	`#include "postgres_fe.h"`
`9`	`9`	`#include "large_obj.h"`
`@@ -178,7 +178,7 @@ do_lo_import(const char filename_arg, const char comment_arg)`
`178`	`178`	`for (i = 0; i < slen; i++)`
`179`	`179`	`{`
`180`	`180`	`if (comment_arg[i] == '\'' \|\| comment_arg[i] == '\\')`
`181`		`- *bufptr++ = '\\';`
	`181`	`+ bufptr++ = comment_arg[i]; / double these */`
`182`	`182`	`*bufptr++ = comment_arg[i];`
`183`	`183`	`}`
`184`	`184`	`strcpy(bufptr, "'");`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`* procedural language`
`5`	`5`	`*`
`6`	`6`	`* IDENTIFICATION`
`7`		`- * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.77 2005/06/22 01:35:02 neilc Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/pl/plpgsql/src/gram.y,v 1.78 2005/07/01 17:40:29 momjian Exp $`
`8`	`8`	`*`
`9`	`9`	`* This software is copyrighted by Jan Wieck - Hamburg.`
`10`	`10`	`*`
`@@ -387,7 +387,7 @@ decl_statement : decl_varname decl_const decl_datatype decl_notnull decl_defval`
`387`	`387`	`while (*cp1 != '\0')`
`388`	`388`	`{`
`389`	`389`	`if (cp1 == '\\' \|\| cp1 == '\'')`
`390`		`- *cp2++ = '\\';`
	`390`	`+ cp2++ = cp1; /* double these */`
`391`	`391`	`cp2++ = cp1++;`
`392`	`392`	`}`
`393`	`393`	`strcpy(cp2, "'::refcursor");`