Skip to content

Commit cd1f408

Browse files
bmomjianbmomjian
committed
Move pg_controldata from /contrib to src/bin.
1 parent 7ffe65f commit cd1f408

File tree

7 files changed

+116
-37
lines changed

7 files changed

+116
-37
lines changed

‎contrib/pg_controldata/README.pg_controldata

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

‎doc/src/sgml/ref/allfiles.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.44 2002/08/04 04:31:44 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/allfiles.sgml,v 1.45 2002/08/16 20:34:06 momjian Exp $
33
PostgreSQL documentation
44
Complete list of usable sgml source files in this directory.
55
-->
@@ -132,6 +132,7 @@ Complete list of usable sgml source files in this directory.
132132
<!entity ipcclean system "ipcclean.sgml">
133133
<!entity pgAccess system "pgaccess-ref.sgml">
134134
<!entity pgConfig system "pg_config-ref.sgml">
135+
<!entity pgControldata system "pg_controldata.sgml">
135136
<!entity pgCtl system "pg_ctl-ref.sgml">
136137
<!entity pgDump system "pg_dump.sgml">
137138
<!entity pgDumpall system "pg_dumpall.sgml">

‎doc/src/sgml/ref/pg_controldata.sgml

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
<!--
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/pg_controldata.sgml,v 1.1 2002/08/16 20:34:06 momjian Exp $
3+
PostgreSQL documentation
4+
-->
5+
6+
<refentry id="APP-PGCONTROLDATA">
7+
<refmeta>
8+
<refentrytitle id="APP-PGCONTROLDATA-TITLE"><application>pg_controldata</application></refentrytitle>
9+
<manvolnum>1</manvolnum>
10+
<refmiscinfo>Application</refmiscinfo>
11+
</refmeta>
12+
13+
<refnamediv>
14+
<refname>pg_controldata</refname>
15+
<refpurpose>display server-wide control information</refpurpose>
16+
</refnamediv>
17+
18+
<refsynopsisdiv>
19+
<cmdsynopsis>
20+
<command>pg_controldata</command>
21+
<arg><replaceable class="parameter">datadir</replaceable></arg>
22+
</cmdsynopsis>
23+
</refsynopsisdiv>
24+
25+
<refsect1 id="R1-APP-PGCONTROLDATA-1">
26+
<title>Description</title>
27+
<para>
28+
<command>pg_controldata</command> returns information initialized during
29+
<application>initdb</>. such as the catalog version and server encoding.
30+
It also shows information about write-ahead logging and checkpoint
31+
processing. This information is server-wide, and not specific to any one
32+
database.
33+
</para>
34+
35+
<para>
36+
You can specify the data directory on the command line, or use
37+
the environment variable <envar>PGDATA</>.
38+
</para>
39+
</refsect1>
40+
41+
<refsect1>
42+
<title>Environment</title>
43+
44+
<variablelist>
45+
<varlistentry>
46+
<term><envar>PGDATA</envar></term>
47+
48+
<listitem>
49+
<para>
50+
Default data direction location
51+
</para>
52+
</listitem>
53+
</varlistentry>
54+
55+
</variablelist>
56+
</refsect1>
57+
</refentry>
58+
59+
<!-- Keep this comment at the end of the file
60+
Local variables:
61+
mode: sgml
62+
sgml-omittag:nil
63+
sgml-shorttag:t
64+
sgml-minimize-attributes:nil
65+
sgml-always-quote-attributes:t
66+
sgml-indent-step:1
67+
sgml-indent-data:t
68+
sgml-parent-document:nil
69+
sgml-default-dtd-file:"../reference.ced"
70+
sgml-exposed-tags:nil
71+
sgml-local-catalogs:"/usr/lib/sgml/catalog"
72+
sgml-local-ecat-files:nil
73+
End:
74+
-->

‎doc/src/sgml/ref/psql-ref.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.71 2002/08/10 19:35:00 tgl Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/ref/psql-ref.sgml,v 1.72 2002/08/16 20:34:06 momjian Exp $
33
PostgreSQL documentation
44
-->
55

@@ -22,7 +22,7 @@ PostgreSQL documentation
2222
<command>psql</command>
2323
<arg><replaceable class="parameter">options</replaceable></arg>
2424
<arg><replaceable class="parameter">dbname</replaceable>
25-
<arg><replaceable class="parameter">user</replaceable></arg></arg>
25+
<arg><replaceable class="parameter">user</replaceable></arg></arg>
2626
</cmdsynopsis>
2727
</refsynopsisdiv>
2828

‎doc/src/sgml/reference.sgml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!-- reference.sgml
2-
$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.33 2002/08/04 04:31:44 momjian Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/reference.sgml,v 1.34 2002/08/16 20:34:06 momjian Exp $
33

44
PostgreSQL Reference Manual
55
-->
@@ -201,6 +201,7 @@ Disable this chapter until we have more functions documented.
201201
&initlocation;
202202
&ipcclean;
203203
&pgCtl;
204+
&pgControldata;
204205
&postgres;
205206
&postmaster;
206207

‎src/bin/pg_controldata/Makefile

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#-------------------------------------------------------------------------
2+
#
3+
# Makefile for src/bin/pg_controldata
4+
#
5+
# Copyright (c) 1998, PostgreSQL Global Development Group
6+
#
7+
# $Header: /cvsroot/pgsql/src/bin/pg_controldata/Makefile,v 1.1 2002/08/16 20:34:06 momjian Exp $
8+
#
9+
#-------------------------------------------------------------------------
10+
11+
subdir = src/bin/pg_controldata
12+
top_builddir = ../../..
13+
include $(top_builddir)/src/Makefile.global
14+
15+
OBJS= pg_controldata.o pg_crc.o
16+
17+
pg_crc.c: $(top_builddir)/src/backend/utils/hash/pg_crc.c
18+
rm -f $@ && $(LN_S) $< .
19+
20+
all: submake-libpq submake-libpgport pg_controldata
21+
22+
pg_controldata: $(OBJS)
23+
$(CC) $(CFLAGS) $^ $(libpq) $(LDFLAGS) $(LIBS) -o $@
24+
25+
install: all installdirs
26+
$(INSTALL_PROGRAM) pg_controldata$(X) $(DESTDIR)$(bindir)/pg_controldata$(X)
27+
28+
installdirs:
29+
$(mkinstalldirs) $(DESTDIR)$(bindir)
30+
31+
uninstall:
32+
rm -f $(DESTDIR)$(bindir)/pg_controldata$(X)
33+
34+
clean distclean maintainer-clean:
35+
rm -f pg_controldata$(X) pg_controldata.o pg_crc.o pg_crc.c

‎contrib/pg_controldata/pg_controldata.c renamed to ‎src/bin/pg_controldata/pg_controldata.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* copyright (c) Oliver Elphick <olly@lfix.co.uk>, 2001;
77
* licence: BSD
88
*
9-
* $Header: /cvsroot/pgsql/contrib/pg_controldata/Attic/pg_controldata.c,v 1.7 2002/08/14 03:01:43 momjian Exp $
9+
* $Header: /cvsroot/pgsql/src/bin/pg_controldata/pg_controldata.c,v 1.1 2002/08/16 20:34:06 momjian Exp $
1010
*/
1111
#include "postgres.h"
1212

0 commit comments

Comments
 (0)