Thread: CR fix for create_help.pl

CR fix for create_help.pl

From
Andrew Dunstan
Date:
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.

cheers

andrew


Index: src/bin/psql/create_help.pl
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/create_help.pl,v
retrieving revision 1.10
diff -c -w -r1.10 create_help.pl
*** src/bin/psql/create_help.pl    29 Nov 2003 19:52:06 -0000    1.10
--- src/bin/psql/create_help.pl    9 Jun 2004 13:46:58 -0000
***************
*** 109,115 ****
          $cmddesc =~ s/\"/\\"/g;

      $cmdsynopsis =~ s/<[^>]+>//g;
!     $cmdsynopsis =~ s/\n/\\n/g;
          $cmdsynopsis =~ s/\"/\\"/g;

      print OUT "    { \"$cmdname\",\n      N_(\"$cmddesc\"),\n      N_(\"$cmdsynopsis\") },\n\n";
--- 109,115 ----
          $cmddesc =~ s/\"/\\"/g;

      $cmdsynopsis =~ s/<[^>]+>//g;
!     $cmdsynopsis =~ s/\r?\n/\\n/g;
          $cmdsynopsis =~ s/\"/\\"/g;

      print OUT "    { \"$cmdname\",\n      N_(\"$cmddesc\"),\n      N_(\"$cmdsynopsis\") },\n\n";

Re: CR fix for create_help.pl

From
Bruce Momjian
Date:
Patch applied.  Thanks.

---------------------------------------------------------------------------


Andrew Dunstan wrote:
>
> 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.
>
> cheers
>
> andrew
>
>

> Index: src/bin/psql/create_help.pl
> ===================================================================
> RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/create_help.pl,v
> retrieving revision 1.10
> diff -c -w -r1.10 create_help.pl
> *** src/bin/psql/create_help.pl    29 Nov 2003 19:52:06 -0000    1.10
> --- src/bin/psql/create_help.pl    9 Jun 2004 13:46:58 -0000
> ***************
> *** 109,115 ****
>           $cmddesc =~ s/\"/\\"/g;
>
>       $cmdsynopsis =~ s/<[^>]+>//g;
> !     $cmdsynopsis =~ s/\n/\\n/g;
>           $cmdsynopsis =~ s/\"/\\"/g;
>
>       print OUT "    { \"$cmdname\",\n      N_(\"$cmddesc\"),\n      N_(\"$cmdsynopsis\") },\n\n";
> --- 109,115 ----
>           $cmddesc =~ s/\"/\\"/g;
>
>       $cmdsynopsis =~ s/<[^>]+>//g;
> !     $cmdsynopsis =~ s/\r?\n/\\n/g;
>           $cmdsynopsis =~ s/\"/\\"/g;
>
>       print OUT "    { \"$cmdname\",\n      N_(\"$cmddesc\"),\n      N_(\"$cmdsynopsis\") },\n\n";

>
> ---------------------------(end of broadcast)---------------------------
> TIP 8: explain analyze is your friend

--
  Bruce Momjian                        |  http://candle.pha.pa.us
  pgman@candle.pha.pa.us               |  (610) 359-1001
  +  If your life is a hard drive,     |  13 Roberts Road
  +  Christ can be your backup.        |  Newtown Square, Pennsylvania 19073