From ca9540d34f0ad97c5659cac30aab8a016bd9868c Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Sun, 1 Aug 2004 06:19:26 +0000
Subject: Add docs for initdb --auth.

---
 src/backend/commands/dbcommands.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'src/backend/commands/dbcommands.c')

diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index b9e8c836274..bacf5aa31af 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -9,7 +9,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.137 2004/06/25 21:55:53 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/dbcommands.c,v 1.138 2004/08/01 06:19:22 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -915,7 +915,6 @@ remove_dbtablespaces(Oid db_id)
 	Relation rel;
 	HeapScanDesc scan;
 	HeapTuple tuple;
-	char buf[MAXPGPATH + 100];
 
 	rel = heap_openr(TableSpaceRelationName, AccessShareLock);
 	scan = heap_beginscan(rel, SnapshotNow, 0, NULL);
@@ -938,17 +937,11 @@ remove_dbtablespaces(Oid db_id)
 			continue;
 		}
 
-#ifndef WIN32
-		snprintf(buf, sizeof(buf), "rm -rf '%s'", dstpath);
-#else
-		snprintf(buf, sizeof(buf), "rmdir /s /q \"%s\"", dstpath);
-#endif
-		if (system(buf) != 0)
+		if (!rmtree(dstpath, true))
 		{
 			ereport(WARNING,
 				(errmsg("could not remove database directory \"%s\"",
 						dstpath),
-				 errdetail("Failing system command was: %s", buf),
 				 errhint("Look in the postmaster's stderr log for more information.")));
 		}
 
-- 
cgit v1.2.3