From 1261fe18ff2a4ed3a81b4cc355b6b2643b9a2eff Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 11 Jun 2004 03:56:46 +0000 Subject: [PATCH] The attached tiny patch removes spurious carriage returns that might be copied by the script that generates psql's help. (You can get the spurious CRs if you use a CVS client on Windows that does line end translation.) Elsewhere, the patch should be totally benign. This removes quite a number of the compile warnings I posted the other day. Andrew Dunstan --- src/bin/psql/create_help.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl index fb3bf3c351..1c08a65bc9 100644 --- a/src/bin/psql/create_help.pl +++ b/src/bin/psql/create_help.pl @@ -5,7 +5,7 @@ # # Copyright (c) 2000-2003, PostgreSQL Global Development Group # -# $PostgreSQL: pgsql/src/bin/psql/create_help.pl,v 1.10 2003/11/29 19:52:06 pgsql Exp $ +# $PostgreSQL: pgsql/src/bin/psql/create_help.pl,v 1.11 2004/06/11 03:56:46 momjian Exp $ ################################################################# # @@ -109,7 +109,7 @@ foreach $file (sort readdir DIR) { $cmddesc =~ s/\"/\\"/g; $cmdsynopsis =~ s/<[^>]+>//g; - $cmdsynopsis =~ s/\n/\\n/g; + $cmdsynopsis =~ s/\r?\n/\\n/g; $cmdsynopsis =~ s/\"/\\"/g; print OUT " { \"$cmdname\",\n N_(\"$cmddesc\"),\n N_(\"$cmdsynopsis\") },\n\n"; -- 2.40.0