From 2712ca771d4a1392a73948d3a269e14d0cec74f2 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 1 Dec 2003 23:15:47 +0000
Subject: [PATCH] Fix initdb use of mkdir_p().
Andrew Dunstan
---
src/bin/initdb/initdb.c | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 553a3ec0d53..0d0628a28a0 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -43,7 +43,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD.
*
- * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.15 2003/11/29 19:52:04 pgsql Exp $
+ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.16 2003/12/01 23:15:47 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -801,7 +801,6 @@ static bool
mkdatadir(char *subdir)
{
char *path;
- int res;
path = xmalloc(strlen(pg_data) + 2 +
(subdir == NULL ? 0 : strlen(subdir)));
@@ -811,13 +810,7 @@ mkdatadir(char *subdir)
else
strcpy(path, pg_data);
- res = mkdir(path, 0700);
- if (res == 0)
- return true;
- else if (subdir == NULL || errno != ENOENT)
- return false;
- else
- return !mkdir_p(path, 0700);
+ return (mkdir_p(path, 0700) == 0);
}
--
GitLab