diff options
| author | Bruce Momjian <bruce@momjian.us> | 2003-04-04 20:42:13 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2003-04-04 20:42:13 +0000 |
| commit | d46e6438225d8741100dc400a4a63c87799f0945 (patch) | |
| tree | c20b838ead99ca2558a188b84595115538c02dd2 /src/backend/commands/dbcommands.c | |
| parent | 9bad936f67cb7561d0d232ca365e23fe73219a1a (diff) | |
| download | postgresql-d46e6438225d8741100dc400a4a63c87799f0945.tar.gz postgresql-d46e6438225d8741100dc400a4a63c87799f0945.zip | |
Add Win32 path handling for / vs. \ and drive letters.
Diffstat (limited to 'src/backend/commands/dbcommands.c')
| -rw-r--r-- | src/backend/commands/dbcommands.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c index 32c4c459c9a..3ef778c9648 100644 --- a/src/backend/commands/dbcommands.c +++ b/src/backend/commands/dbcommands.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.111 2003/04/04 20:40:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/commands/dbcommands.c,v 1.112 2003/04/04 20:42:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -698,9 +698,9 @@ resolve_alt_dbpath(const char *dbpath, Oid dboid) if (dbpath == NULL || dbpath[0] == '\0') return NULL; - if (strchr(dbpath, '/')) + if (first_path_separator(dbpath)) { - if (dbpath[0] != '/') + if (!is_absolute_path(dbpath)) elog(ERROR, "Relative paths are not allowed as database locations"); #ifndef ALLOW_ABSOLUTE_DBPATHS elog(ERROR, "Absolute paths are not allowed as database locations"); @@ -714,7 +714,7 @@ resolve_alt_dbpath(const char *dbpath, Oid dboid) if (!var) elog(ERROR, "Postmaster environment variable '%s' not set", dbpath); - if (var[0] != '/') + if (!is_absolute_path(var)) elog(ERROR, "Postmaster environment variable '%s' must be absolute path", dbpath); prefix = var; } |