Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit65e0051

Browse files
committed
another round of user interface cleanups
removed pg_idfixed a few bugs in the scripts
1 parentea1f6e0 commit65e0051

File tree

19 files changed

+161
-282
lines changed

19 files changed

+161
-282
lines changed

‎doc/src/sgml/ref/createlang.sgml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.3 1999/12/05 20:02:42 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/createlang.sgml,v 1.4 2000/01/19 20:08:22 petere Exp $
33
Postgres documentation
44
-->
55

@@ -114,16 +114,6 @@ createlang [ <replaceable class="parameter">connection options</replaceable> ] -
114114
</listitem>
115115
</varlistentry>
116116

117-
<varlistentry>
118-
<term>-e, --echo</term>
119-
<listitem>
120-
<para>
121-
Echo the commands that <application>createlang</application> generates
122-
and sends to the backend.
123-
</para>
124-
</listitem>
125-
</varlistentry>
126-
127117
</variablelist>
128118
</para>
129119
</refsect2>
@@ -142,9 +132,6 @@ createlang [ <replaceable class="parameter">connection options</replaceable> ] -
142132
for details. Check also under <xref linkend="APP-PSQL" endterm="APP-PSQL-title">
143133
for more possibilities.
144134
</para>
145-
<para>
146-
No output is generated if <application>createlang</application> succeeds.
147-
</para>
148135
</refsect2>
149136
</refsynopsisdiv>
150137

‎doc/src/sgml/ref/droplang.sgml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.1 1999/12/05 20:04:39 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/droplang.sgml,v 1.2 2000/01/19 20:08:22 petere Exp $
33
Postgres documentation
44
-->
55

@@ -114,16 +114,6 @@ droplang [ <replaceable class="parameter">connection options</replaceable> ] --l
114114
</listitem>
115115
</varlistentry>
116116

117-
<varlistentry>
118-
<term>-e, --echo</term>
119-
<listitem>
120-
<para>
121-
Echo the commands that <application>droplang</application> generates
122-
and sends to the backend.
123-
</para>
124-
</listitem>
125-
</varlistentry>
126-
127117
</variablelist>
128118
</para>
129119
</refsect2>
@@ -142,9 +132,6 @@ droplang [ <replaceable class="parameter">connection options</replaceable> ] --l
142132
for details. Check also under <xref linkend="APP-PSQL" endterm="APP-PSQL-title">
143133
for more possibilities.
144134
</para>
145-
<para>
146-
No output is generated if <application>droplang</application> succeeds.
147-
</para>
148135
</refsect2>
149136
</refsynopsisdiv>
150137

‎src/bin/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#-------------------------------------------------------------------------
22
#
33
# Makefile
4-
# Makefile for src/bin (utility programs)
4+
# Makefile for src/bin (client programs)
55
#
66
# Copyright (c) 1994, Regents of the University of California
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.23 2000/01/1902:58:59 petere Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/Makefile,v 1.24 2000/01/1920:08:23 petere Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

‎src/bin/initdb/initdb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#
2727
#
2828
# IDENTIFICATION
29-
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.80 2000/01/18 00:03:35 petere Exp $
29+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.81 2000/01/19 20:08:24 petere Exp $
3030
#
3131
#-------------------------------------------------------------------------
3232

@@ -235,7 +235,7 @@ if [ "$usage" ]; then
235235
echo" -d, --debug Generate lots of debugging output"
236236
echo" -n, --noclean Do not clean up after errors"
237237
echo
238-
echo"Report bugs to <bugs@postgresql.org>."
238+
echo"Report bugs to <pgsql-bugs@postgresql.org>."
239239
exit 0
240240
fi
241241

‎src/bin/initlocation/initlocation.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.4 2000/01/18 00:03:36 petere Exp $
11+
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/initlocation.sh,v 1.5 2000/01/19 20:08:25 petere Exp $
1212
#
1313
#-------------------------------------------------------------------------
1414

@@ -68,7 +68,7 @@ if [ "$usage" ]; then
6868
echo"Usage:"
6969
echo"$CMDNAME <location>"
7070
echo""
71-
echo"Report bugs to <bugs@postgresql.org>."
71+
echo"Report bugs to <pgsql-bugs@postgresql.org>."
7272
exit 0
7373
fi
7474

‎src/bin/ipcclean/ipcclean.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
#
3-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.3 2000/01/18 00:03:36 petere Exp $
3+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.4 2000/01/19 20:08:27 petere Exp $
44
#
55

66
CMDNAME=`basename$0`
@@ -13,7 +13,7 @@ if [ "$1" = '-?' -o "$1" = "--help" ]; then
1313
echo
1414
echo"Note: Since the utilities underlying this script are very different"
1515
echo"from platform to platform, chances are that it might not work on"
16-
echo"yours. If that is the case, please write to <bugs@postgresql.org>"
16+
echo"yours. If that is the case, please write to <pgsql-bugs@postgresql.org>"
1717
echo"so that your platform can be supported in the future."
1818
exit 0
1919
fi

‎src/bin/pg_dump/pg_dump.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
*
2222
*
2323
* IDENTIFICATION
24-
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.136 2000/01/1902:58:59 petere Exp $
24+
* $Header: /cvsroot/pgsql/src/bin/pg_dump/pg_dump.c,v 1.137 2000/01/1920:08:30 petere Exp $
2525
*
2626
* Modifications - 6/10/96 - dave@bensoft.com - version 1.13.dhb
2727
*
@@ -167,7 +167,7 @@ help(const char *progname)
167167
);
168168
#endif
169169
puts("If no database name is not supplied, then the PGDATABASE environment\nvariable value is used.\n");
170-
puts("Report bugs to <bugs@postgresql.org>.");
170+
puts("Report bugs to <pgsql-bugs@postgresql.org>.");
171171
}
172172

173173

‎src/bin/pg_id/Makefile

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎src/bin/pg_id/pg_id.c

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎src/bin/psql/common.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Team
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.9 2000/01/18 23:30:23 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/common.c,v 1.10 2000/01/19 20:08:33 petere Exp $
77
*/
88
#include<c.h>
99
#include"common.h"
@@ -146,7 +146,7 @@ psql_error(const char *fmt, ...)
146146
fflush(pset.queryFout);
147147

148148
if (pset.inputfile)
149-
fprintf(stderr,"%s:%u: ",pset.inputfile ?pset.inputfile :pset.progname,pset.lineno);
149+
fprintf(stderr,"%s:%s:%u: ",pset.progname,pset.inputfile,pset.lineno);
150150
va_start(ap,fmt);
151151
vfprintf(stderr,fmt,ap);
152152
va_end(ap);

‎src/bin/psql/help.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Team
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.11 2000/01/18 23:30:23 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/help.c,v 1.12 2000/01/19 20:08:34 petere Exp $
77
*/
88
#include<c.h>
99
#include"help.h"
@@ -129,7 +129,7 @@ usage(void)
129129
puts("(for SQL commands) from within psql, or consult the psql section in");
130130
puts("the PostgreSQL manual, which accompanies the distribution and is also");
131131
puts("available at <http://www.postgresql.org>.");
132-
puts("Report bugs to <bugs@postgresql.org>.");
132+
puts("Report bugs to <pgsql-bugs@postgresql.org>.");
133133

134134
#ifndefWIN32
135135
if (pw)

‎src/bin/psql/startup.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
* Copyright 2000 by PostgreSQL Global Development Team
55
*
6-
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.16 2000/01/18 23:30:24 petere Exp $
6+
* $Header: /cvsroot/pgsql/src/bin/psql/startup.c,v 1.17 2000/01/19 20:08:34 petere Exp $
77
*/
88
#include<c.h>
99

@@ -205,10 +205,18 @@ main(int argc, char **argv)
205205
successResult=process_file(options.action_string) ?0 :1;
206206
/* process slash command if one was given to -c */
207207
elseif (options.action==ACT_SINGLE_SLASH)
208+
{
209+
if (GetVariable(pset.vars,"ECHO")&&strcmp(GetVariable(pset.vars,"ECHO"),"full")==0)
210+
puts(options.action_string);
208211
successResult=HandleSlashCmds(options.action_string,NULL,NULL)!=CMD_ERROR ?0 :1;
212+
}
209213
/* If the query given to -c was a normal one, send it */
210214
elseif (options.action==ACT_SINGLE_QUERY)
215+
{
216+
if (GetVariable(pset.vars,"ECHO")&&strcmp(GetVariable(pset.vars,"ECHO"),"full")==0)
217+
puts(options.action_string);
211218
successResult=SendQuery(options.action_string) ?0 :1;
219+
}
212220
/* or otherwise enter interactive main loop */
213221
else
214222
{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp