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/utils/init/miscinit.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/utils/init/miscinit.c')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 8b49ca2e584..6ffd1e01b97 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.101 2003/03/20 04:51:44 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.102 2003/04/04 20:42:12 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -134,7 +134,7 @@ SetDataDir(const char *dir) AssertArg(dir); /* If presented path is relative, convert to absolute */ - if (dir[0] != '/') + if (!is_absolute_path(dir)) { char *buf; size_t buflen; @@ -179,7 +179,11 @@ SetDataDir(const char *dir) * generating funny-looking paths to individual files. */ newlen = strlen(new); - if (newlen > 1 && new[newlen - 1] == '/') + if (newlen > 1 && new[newlen - 1] == '/' +#ifdef WIN32 + || new[newlen - 1] == '\\' +#endif + ) new[newlen - 1] = '\0'; if (DataDir) |