From 35411a878b50b545d2ceaa15c11015d858c83dda Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Thu, 24 Mar 2005 17:22:44 +0000 Subject: Adjust plpython to convert \r\n and \r to \n in Python scripts, per recent discussion concluding that this is the Right Thing. Add regression test check for this behavior. Michael Fuhr --- src/pl/plpython/plpython.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/pl/plpython/plpython.c') diff --git a/src/pl/plpython/plpython.c b/src/pl/plpython/plpython.c index 5f5b36b0a50..ff584f077dd 100644 --- a/src/pl/plpython/plpython.c +++ b/src/pl/plpython/plpython.c @@ -29,7 +29,7 @@ * MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.58 2004/12/17 02:14:48 tgl Exp $ + * $PostgreSQL: pgsql/src/pl/plpython/plpython.c,v 1.58.4.1 2005/03/24 17:22:44 tgl Exp $ * ********************************************************************* */ @@ -1206,10 +1206,14 @@ PLy_procedure_munge_source(const char *name, const char *src) while (*sp != '\0') { - if (*sp == '\n') + if (*sp == '\r' && *(sp + 1) == '\n') + sp++; + + if (*sp == '\n' || *sp == '\r') { - *mp++ = *sp++; + *mp++ = '\n'; *mp++ = '\t'; + sp++; } else *mp++ = *sp++; -- cgit v1.2.3