aboutsummaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/access/transam/xlog.c17
-rw-r--r--src/backend/catalog/catalog.c15
-rw-r--r--src/backend/postmaster/postmaster.c5
-rw-r--r--src/backend/storage/file/fd.c6
-rw-r--r--src/backend/utils/cache/relcache.c10
-rw-r--r--src/backend/utils/error/elog.c6
-rw-r--r--src/backend/utils/misc/database.c17
7 files changed, 35 insertions, 41 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index cf213ada268..efb2d48d9ec 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.66 2001/05/22 16:52:49 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.67 2001/05/30 14:15:25 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -336,8 +336,8 @@ static ControlFileData *ControlFile = NULL;
#define XLogFileName(path, log, seg) \
- snprintf(path, MAXPGPATH, "%s%c%08X%08X", \
- XLogDir, SEP_CHAR, log, seg)
+ snprintf(path, MAXPGPATH, "%s/%08X%08X", \
+ XLogDir, log, seg)
#define PrevBufIdx(idx) \
(((idx) == 0) ? XLogCtl->XLogCacheBlck : ((idx) - 1))
@@ -1300,8 +1300,8 @@ XLogFileInit(uint32 log, uint32 seg,
* up pre-creating an extra log segment. That seems OK, and better
* than holding the spinlock throughout this lengthy process.
*/
- snprintf(tmppath, MAXPGPATH, "%s%cxlogtemp.%d",
- XLogDir, SEP_CHAR, (int) getpid());
+ snprintf(tmppath, MAXPGPATH, "%s/xlogtemp.%d",
+ XLogDir, (int) getpid());
unlink(tmppath);
@@ -1495,7 +1495,7 @@ MoveOfflineLogs(uint32 log, uint32 seg)
{
elog(LOG, "MoveOfflineLogs: %s %s", (XLOG_archive_dir[0]) ?
"archive" : "remove", xlde->d_name);
- sprintf(path, "%s%c%s", XLogDir, SEP_CHAR, xlde->d_name);
+ sprintf(path, "%s/%s", XLogDir, xlde->d_name);
if (XLOG_archive_dir[0] == 0)
unlink(path);
}
@@ -1911,9 +1911,8 @@ void
XLOGPathInit(void)
{
/* Init XLOG file paths */
- snprintf(XLogDir, MAXPGPATH, "%s%cpg_xlog", DataDir, SEP_CHAR);
- snprintf(ControlFilePath, MAXPGPATH, "%s%cglobal%cpg_control",
- DataDir, SEP_CHAR, SEP_CHAR);
+ snprintf(XLogDir, MAXPGPATH, "%s/pg_xlog", DataDir);
+ snprintf(ControlFilePath, MAXPGPATH, "%s/global/pg_control", DataDir);
}
static void
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 7d10bdea7a7..23237e75b3c 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;
}
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index de053e15584..b2a7448b52f 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -28,7 +28,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.214 2001/05/25 15:45:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/postmaster/postmaster.c,v 1.215 2001/05/30 14:15:26 momjian Exp $
*
* NOTES
*
@@ -272,8 +272,7 @@ checkDataDir(const char *checkdir)
ExitPostmaster(2);
}
- snprintf(path, sizeof(path), "%s%cglobal%cpg_control",
- checkdir, SEP_CHAR, SEP_CHAR);
+ snprintf(path, sizeof(path), "%s/global/pg_control", checkdir);
fp = AllocateFile(path, PG_BINARY_R);
if (fp == NULL)
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 23c1ef8d808..06ee4bc2729 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.78 2001/05/25 15:45:33 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/storage/file/fd.c,v 1.79 2001/05/30 14:15:26 momjian Exp $
*
* NOTES:
*
@@ -580,11 +580,11 @@ filepath(char *filename)
int len;
/* Not an absolute path name? Then fill in with database path... */
- if (*filename != SEP_CHAR)
+ if (*filename != '/')
{
len = strlen(DatabasePath) + strlen(filename) + 2;
buf = (char *) palloc(len);
- sprintf(buf, "%s%c%s", DatabasePath, SEP_CHAR, filename);
+ sprintf(buf, "%s/%s", DatabasePath, filename);
}
else
{
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index d2459f7766b..d04e0cd5592 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.134 2001/05/14 22:06:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.135 2001/05/30 14:15:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -2810,10 +2810,10 @@ write_irels(void)
* another backend starting at about the same time might crash trying
* to read the partially-complete file.
*/
- snprintf(tempfilename, sizeof(tempfilename), "%s%c%s.%d",
- DatabasePath, SEP_CHAR, RELCACHE_INIT_FILENAME, MyProcPid);
- snprintf(finalfilename, sizeof(finalfilename), "%s%c%s",
- DatabasePath, SEP_CHAR, RELCACHE_INIT_FILENAME);
+ snprintf(tempfilename, sizeof(tempfilename), "%s/%s.%d",
+ DatabasePath, RELCACHE_INIT_FILENAME, MyProcPid);
+ snprintf(finalfilename, sizeof(finalfilename), "%s/%s",
+ DatabasePath, RELCACHE_INIT_FILENAME);
fd = PathNameOpenFile(tempfilename, O_WRONLY | O_CREAT | O_TRUNC | PG_BINARY, 0600);
if (fd < 0)
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 55c7e69c67b..556fa0da9fc 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.83 2001/03/22 03:59:58 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/error/elog.c,v 1.84 2001/05/30 14:15:26 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -562,8 +562,8 @@ DebugFileOpen(void)
fd = fileno(stderr);
if (fcntl(fd, F_GETFD, 0) < 0)
{
- snprintf(OutputFileName, MAXPGPATH, "%s%cpg.errors.%d",
- DataDir, SEP_CHAR, (int) MyProcPid);
+ snprintf(OutputFileName, MAXPGPATH, "%s/pg.errors.%d",
+ DataDir, (int) MyProcPid);
fd = open(OutputFileName, O_CREAT | O_APPEND | O_WRONLY, 0666);
}
if (fd < 0)
diff --git a/src/backend/utils/misc/database.c b/src/backend/utils/misc/database.c
index 21afef019c9..73034d2e785 100644
--- a/src/backend/utils/misc/database.c
+++ b/src/backend/utils/misc/database.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.45 2001/03/22 06:16:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/utils/misc/Attic/database.c,v 1.46 2001/05/30 14:15:27 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -52,20 +52,19 @@ ExpandDatabasePath(const char *dbpath)
return NULL; /* ain't gonna fit nohow */
/* leading path delimiter? then already absolute path */
- if (*dbpath == SEP_CHAR)
+ if (*dbpath == '/')
{
#ifdef ALLOW_ABSOLUTE_DBPATHS
- cp = strrchr(dbpath, SEP_CHAR);
+ cp = strrchr(dbpath, '/');
len = cp - dbpath;
strncpy(buf, dbpath, len);
- snprintf(&buf[len], MAXPGPATH - len, "%cbase%c%s",
- SEP_CHAR, SEP_CHAR, (cp + 1));
+ snprintf(&buf[len], MAXPGPATH - len, "/base/%s", (cp + 1));
#else
return NULL;
#endif
}
/* path delimiter somewhere? then has leading environment variable */
- else if ((cp = strchr(dbpath, SEP_CHAR)) != NULL)
+ else if ((cp = strchr(dbpath, '/')) != NULL)
{
const char *envvar;
@@ -76,14 +75,12 @@ ExpandDatabasePath(const char *dbpath)
if (envvar == NULL)
return NULL;
- snprintf(buf, sizeof(buf), "%s%cbase%c%s",
- envvar, SEP_CHAR, SEP_CHAR, (cp + 1));
+ snprintf(buf, sizeof(buf), "%s/base/%s", envvar, (cp + 1));
}
else
{
/* no path delimiter? then add the default path prefix */
- snprintf(buf, sizeof(buf), "%s%cbase%c%s",
- DataDir, SEP_CHAR, SEP_CHAR, dbpath);
+ snprintf(buf, sizeof(buf), "%s/base/%s", DataDir, dbpath);
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-05 21:48:00 +0000