Change clusterdb and vacuumdb into C programs.

Author: petere

doc/src/sgml/maintenance.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.22 2003/03/25 16:15:37 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.23 2003/06/18 12:19:11 petere Exp $
 -->
 
 <chapter id="maintenance">
@@ -136,7 +136,7 @@ $Header: /cvsroot/pgsql/doc/src/sgml/maintenance.sgml,v 1.22 2003/03/25 16:15:37
     <command>VACUUM</> once a day at a low-usage time of day, supplemented
     by more frequent vacuuming of heavily-updated tables if necessary.
     (If you have multiple databases in a cluster, don't forget to
-    vacuum each one; the <filename>vacuumdb</> script may be helpful.)
+    vacuum each one; the program <filename>vacuumdb</> may be helpful.)
     Use plain <command>VACUUM</>, not <command>VACUUM FULL</>, for routine
     vacuuming for space recovery.
    </para>

doc/src/sgml/ref/clusterdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.9 2003/03/24 14:32:51 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/clusterdb.sgml,v 1.10 2003/06/18 12:19:11 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -41,16 +41,13 @@ PostgreSQL documentation
   </para>
 
   <para>
-   <application>clusterdb</application> is a shell script wrapper around the
-   backend command
-   <xref linkend="SQL-CLUSTER" endterm="sql-cluster-title"> via
-   the <productname>PostgreSQL</productname> interactive terminal
-   <xref linkend="APP-PSQL">. There is no effective
-   difference between clustering databases via this or other methods.
-   <application>psql</application> must be found by the script and
-   a database server must be running at the targeted host. Also, any default
-   settings and environment variables available to <application>psql</application>
-   and the <application>libpq</application> front-end library do apply.
+   <application>clusterdb</application> is a wrapper around the SQL
+   command <xref linkend="SQL-CLUSTER" endterm="sql-cluster-title">.
+   There is no effective difference between clustering databases via
+   this or other methods.  The database server must be running at the
+   targeted host.  Also, any default settings and environment
+   variables used by the <application>libpq</application> front-end
+   library will apply.
   </para>
 
  </refsect1>

doc/src/sgml/ref/dropuser.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.25 2003/05/26 17:50:09 momjian Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/dropuser.sgml,v 1.26 2003/06/18 12:19:11 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -37,13 +37,13 @@ PostgreSQL documentation
   </para>
 
   <para>
-   <application>dropuser</application> is a shell script wrapper
-   around the <acronym>SQL</acronym> command <xref
-   linkend="SQL-DROPUSER" endterm="SQL-DROPUSER-title">.  The database 
-   server must be running on the targeted host. There
-   is nothing special about removing users via this or other
-   methods. Also, any default settings and environment variables
-   used by the <application>libpq</application> front-end library will apply.
+   <application>dropuser</application> is a wrapper around the
+   <acronym>SQL</acronym> command <xref linkend="SQL-DROPUSER"
+   endterm="SQL-DROPUSER-title">.  The database server must be running
+   on the targeted host.  There is nothing special about removing
+   users via this or other methods.  Also, any default settings and
+   environment variables used by the <application>libpq</application>
+   front-end library will apply.
   </para>
  </refsect1>
 

doc/src/sgml/ref/vacuumdb.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.28 2003/03/24 14:32:51 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/vacuumdb.sgml,v 1.29 2003/06/18 12:19:11 petere Exp $
 PostgreSQL documentation
 -->
 
@@ -48,16 +48,13 @@ PostgreSQL documentation
   </para>
 
   <para>
-   <application>vacuumdb</application> is a shell script wrapper around the
-   backend command
-   <xref linkend="SQL-VACUUM" endterm="SQL-VACUUM-title"> via
-   the <productname>PostgreSQL</productname> interactive terminal
-   <xref linkend="APP-PSQL">. There is no effective
-   difference between vacuuming databases via this or other methods.
-   <application>psql</application> must be found by the script and
-   a database server must be running at the targeted host. Also, any default
-   settings and environment variables available to <application>psql</application>
-   and the <application>libpq</application> front-end library do apply.
+   <application>vacuumdb</application> is a wrapper around the SQL
+   command <xref linkend="SQL-VACUUM" endterm="SQL-VACUUM-title">.
+   There is no effective difference between vacuuming databases via
+   this or other methods.  The database server must be running at the
+   targeted host.  Also, any default settings and environment
+   variables used by the <application>libpq</application> front-end
+   library will apply.
   </para>
 
 

src/bin/scripts/Makefile

@@ -5,16 +5,15 @@
 # Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.20 2003/04/16 05:23:55 tgl Exp $
+# $Header: /cvsroot/pgsql/src/bin/scripts/Makefile,v 1.21 2003/06/18 12:19:11 petere Exp $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/bin/scripts
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-SCRIPTS := vacuumdb clusterdb
-PROGRAMS = createdb createlang createuser dropdb droplang dropuser
+PROGRAMS = createdb createlang createuser dropdb droplang dropuser clusterdb vacuumdb
 
 override CPPFLAGS := -I$(top_srcdir)/src/bin/pg_dump -I$(top_srcdir)/src/bin/psql -I$(libpq_srcdir) $(CPPFLAGS)
 
@@ -30,6 +29,8 @@ createuser: createuser.o common.o dumputils.o sprompt.o $(top_builddir)/src/back
 dropdb: dropdb.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
 droplang: droplang.o common.o sprompt.o print.o mbprint.o
 dropuser: dropuser.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
+clusterdb: clusterdb.o common.o dumputils.o sprompt.o $(top_builddir)/src/backend/parser/keywords.o
+vacuumdb: vacuumdb.o common.o sprompt.o
 
 dumputils.c sprompt.c : % : $(top_srcdir)/src/bin/pg_dump/%
 	rm -f $@ && $(LN_S) $< .
@@ -49,14 +50,14 @@ install: all installdirs
 	$(INSTALL_PROGRAM) droplang$(X)   $(DESTDIR)$(bindir)/droplang$(X)
 	$(INSTALL_PROGRAM) createuser$(X) $(DESTDIR)$(bindir)/createuser$(X)
 	$(INSTALL_PROGRAM) dropuser$(X)   $(DESTDIR)$(bindir)/dropuser$(X)
-	$(INSTALL_SCRIPT) $(srcdir)/clusterdb $(DESTDIR)$(bindir)/clusterdb
-	$(INSTALL_SCRIPT) $(srcdir)/vacuumdb  $(DESTDIR)$(bindir)/vacuumdb
+	$(INSTALL_PROGRAM) clusterdb$(X)  $(DESTDIR)$(bindir)/clusterdb$(X)
+	$(INSTALL_PROGRAM) vacuumdb$(X)   $(DESTDIR)$(bindir)/vacuumdb$(X)
 
 installdirs:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 
 uninstall:
-	rm -f $(addprefix $(DESTDIR)$(bindir)/, $(SCRIPTS) $(addsuffix $(X), $(PROGRAMS)))
+	rm -f $(addprefix $(DESTDIR)$(bindir)/, $(addsuffix $(X), $(PROGRAMS)))
 
 
 clean distclean maintainer-clean: