aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/init/miscinit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
-rw-r--r--src/backend/utils/init/miscinit.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 6f9ff5aef4d..b0c5ff82e38 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.126 2004/05/30 23:40:38 neilc Exp $
+ * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.127 2004/06/18 06:13:54 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -157,7 +157,6 @@ void
SetDataDir(const char *dir)
{
char *new;
- int newlen;
AssertArg(dir);
@@ -212,13 +211,7 @@ SetDataDir(const char *dir)
* Strip any trailing slash. Not strictly necessary, but avoids
* generating funny-looking paths to individual files.
*/
- newlen = strlen(new);
- if (newlen > 1 && (new[newlen - 1] == '/'
-#ifdef WIN32
- || new[newlen - 1] == '\\'
-#endif
- ))
- new[newlen - 1] = '\0';
+ canonicalize_path(new);
if (DataDir)
free(DataDir);