diff options
Diffstat (limited to 'src/backend/catalog/catalog.c')
| -rw-r--r-- | src/backend/catalog/catalog.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c index 7d10bdea7a..23237e75b3 100644 --- a/src/backend/catalog/catalog.c +++ b/src/backend/catalog/catalog.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.40 2001/03/22 03:59:19 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/catalog.c,v 1.41 2001/05/30 14:15:26 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -80,7 +80,7 @@ relpath_blind(const char *dbname, const char *relname, { /* XXX why is this inconsistent with relpath() ? */ path = (char *) palloc(strlen(DatabasePath) + sizeof(NameData) + 2); - sprintf(path, "%s%c%s", DatabasePath, SEP_CHAR, relname); + sprintf(path, "%s/%s", DatabasePath, relname); } else { @@ -99,7 +99,7 @@ relpath_blind(const char *dbname, const char *relname, elog(FATAL, "relpath_blind: can't expand path for db %s", dbname); path = (char *) palloc(strlen(dbpath) + sizeof(NameData) + 2); - sprintf(path, "%s%c%s", dbpath, SEP_CHAR, relname); + sprintf(path, "%s/%s", dbpath, relname); pfree(dbpath); } return path; @@ -122,13 +122,12 @@ relpath(RelFileNode rnode) { /* Shared system relations live in {datadir}/global */ path = (char *) palloc(strlen(DataDir) + 8 + sizeof(NameData) + 1); - sprintf(path, "%s%cglobal%c%u", DataDir, SEP_CHAR, SEP_CHAR, rnode.relNode); + sprintf(path, "%s/global/%u", DataDir, rnode.relNode); } else { path = (char *) palloc(strlen(DataDir) + 6 + 2 * sizeof(NameData) + 3); - sprintf(path, "%s%cbase%c%u%c%u", DataDir, SEP_CHAR, SEP_CHAR, - rnode.tblNode, SEP_CHAR, rnode.relNode); + sprintf(path, "%s/base/%u/%u", DataDir, rnode.tblNode, rnode.relNode); } return path; } @@ -148,12 +147,12 @@ GetDatabasePath(Oid tblNode) { /* Shared system relations live in {datadir}/global */ path = (char *) palloc(strlen(DataDir) + 8); - sprintf(path, "%s%cglobal", DataDir, SEP_CHAR); + sprintf(path, "%s/global", DataDir); } else { path = (char *) palloc(strlen(DataDir) + 6 + sizeof(NameData) + 1); - sprintf(path, "%s%cbase%c%u", DataDir, SEP_CHAR, SEP_CHAR, tblNode); + sprintf(path, "%s/base/%u", DataDir, tblNode); } return path; } |