From c6c60302ba45ac89440ec7e2a4e1c5de3a1a61c2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Wed, 10 Nov 1999 01:22:37 +0000
Subject: [PATCH] Cleanup of psql \copyright
---
doc/TODO | 2 +-
src/bin/psql/help.c | 48 ++++++++++++++++++---------------------------
2 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/doc/TODO b/doc/TODO
index eaf58cb72c5..712d6749f40 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -278,7 +278,7 @@ MISC
SOURCE CODE
-----------
-* Add use of 'const' for varibles in source tree
+* Add use of 'const' for variables in source tree
* Fix C optimizer problem where fmgr_ptr calls return different types [alpha]
* -Add needed includes and removed unneeded include files(Bruce)
* Make configure --enable-debug add -g on compile line
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 87d20e6e2bf..ec5a8882893 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -286,33 +286,23 @@ void
print_copyright(void)
{
puts(
- "
- PostgreSQL Data Base Management System
-
- Copyright(c) 1996 - 9 PostgreSQL Global Development Group
-
- This software is based on Postgres95, formerly known as Postgres, which
- contains the following notice:
-
- Copyright(c) 1994 - 7 Regents of the University of California
-
- Permission to use, copy, modify, and distribute this software and its
- documentation for any purpose, without fee, and without a written agreement
- is hereby granted, provided that the above copyright notice and this paragraph
- and the following two paragraphs appear in all copies.
-
- IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR
- DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST
- PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF
- THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
- DAMAGE.
-
- THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
- BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN \"AS IS\" BASIS,
- AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,
- SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
- (end of terms) "
- );
+ "PostgreSQL Data Base Management System\n\n"
+ "Copyright(c) 1996 - 9 PostgreSQL Global Development Group\n\n"
+ "This software is based on Postgres95, formerly known as Postgres, which\n"
+ "contains the following notice:\n\n"
+ "Copyright(c) 1994 - 7 Regents of the University of California\n\n"
+ "Permission to use, copy, modify, and distribute this software and its\n"
+ "documentation for any purpose, without fee, and without a written agreement\n"
+ "is hereby granted, provided that the above copyright notice and this paragraph\n"
+ "and the following two paragraphs appear in all copies.\n\n"
+ "IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR\n"
+ "DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST\n"
+ "PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF\n"
+ "THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH\n"
+ "DAMAGE.\n\n"
+ "THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,\n"
+ "BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A\n"
+ "PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN \"AS IS\" BASIS,\n"
+ "AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,\n"
+ "SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.");
}
--
GitLab