Allow semicolons in psql \h strings

From: "Greg Sabino Mullane" <greg(at)turnstep(dot)com>
To: pgsql-patches(at)postgresql(dot)org
Subject: Allow semicolons in psql \h strings
Date: 2004-08-05 01:45:32
Message-ID: 22a93c164cfcdd06267704bcab32a32b@biglumber.com
Views: Raw Message | Whole Thread | Download mbox | Resend email
Thread:
Lists: pgsql-patches


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
NotDashEscaped: You need GnuPG to verify this message


A minor itch I finally got around to scratching:
allow semicolons at the end of help topics
(also bump copyright years (should really be done for all files))

--
Greg Sabino Mullane greg(at)turnstep(dot)com
PGP Key: 0x14964AC8 200408042143


Index: help.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/bin/psql/help.c,v
retrieving revision 1.90
diff -c -r1.90 help.c
*** help.c 15 Jul 2004 03:56:06 -0000 1.90
--- help.c 4 Aug 2004 19:01:41 -0000
***************
*** 1,7 ****
/*
* psql - the PostgreSQL interactive terminal
*
! * Copyright (c) 2000-2003, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql-server/src/bin/psql/help.c,v 1.90 2004/07/15 03:56:06 momjian Exp $
*/
--- 1,7 ----
/*
* psql - the PostgreSQL interactive terminal
*
! * Copyright (c) 2000-2004, PostgreSQL Global Development Group
*
* $PostgreSQL: pgsql-server/src/bin/psql/help.c,v 1.90 2004/07/15 03:56:06 momjian Exp $
*/
***************
*** 310,318 ****
int nl_count = 0;
char *ch;

! /* don't care about trailing spaces */
len = strlen(topic);
! while (topic[len - 1] == ' ')
len--;

/* Count newlines for pager */
--- 310,318 ----
int nl_count = 0;
char *ch;

! /* don't care about trailing spaces or semicolons */
len = strlen(topic);
! while (' ' == topic[len - 1] || ';' == topic[len - 1])
len--;

/* Count newlines for pager */
***************
*** 372,378 ****
{
puts(
"PostgreSQL Data Base Management System\n\n"
! "Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group\n\n"
"This software is based on Postgres95, formerly known as Postgres, which\n"
"contains the following notice:\n\n"
"Portions Copyright(c) 1994, Regents of the University of California\n\n"
--- 372,378 ----
{
puts(
"PostgreSQL Data Base Management System\n\n"
! "Portions Copyright (c) 1996-2004, PostgreSQL Global Development Group\n\n"
"This software is based on Postgres95, formerly known as Postgres, which\n"
"contains the following notice:\n\n"
"Portions Copyright(c) 1994, Regents of the University of California\n\n"

-----BEGIN PGP SIGNATURE-----

iD8DBQFBEZFlvJuQZxSWSsgRAlLIAKD7GNhFDkbOa8DZNSKhU5Z8rDymtwCfQiWG
fRTYcra52IDgDbIeoChj3k0=
=hkdw
-----END PGP SIGNATURE-----

Responses

Browse pgsql-patches by date

  From Date Subject
Next Message Gavin Sherry 2004-08-05 01:59:13 Minor BEFORE DELETE trigger fix
Previous Message Christopher Kings-Lynne 2004-08-05 01:23:08 Re: More fixes for pg_dump