database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Fix a couple of bugs in win32 shmem name generation:

Browse Source 
* Don't cut off the prefix. With this fix, it's again readable.
* Properly store it in the Global namespace as intended.
This commit is contained in:
Magnus Hagander
2008-07-04 10:50:18 +00:00
parent c63147d6f0
commit d06a8d054d
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/backend/port/win32_shmem.c
View File

@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.4 2008/01/01 19:45:51 momjian Exp $ * $PostgreSQL: pgsql/src/backend/port/win32_shmem.c,v 1.5 2008/07/04 10:50:18 mha Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@@ -47,18 +47,17 @@ GetSharedMemName(void)
elog(FATAL, "could not get size for full pathname of datadir %s: %lu", elog(FATAL, "could not get size for full pathname of datadir %s: %lu",
DataDir, GetLastError()); DataDir, GetLastError());
retptr = malloc(bufsize + 1 + 18); /* 1 NULL and 18 for retptr = malloc(bufsize + 18); /* 18 for Global\PostgreSQL: */
* Global\PostgreSQL: */
if (retptr == NULL) if (retptr == NULL)
elog(FATAL, "could not allocate memory for shared memory name"); elog(FATAL, "could not allocate memory for shared memory name");
strcpy(retptr, "Global\\PostgreSQL:"); strcpy(retptr, "Global\\PostgreSQL:");
r = GetFullPathName(DataDir, bufsize, retptr + 11, NULL); r = GetFullPathName(DataDir, bufsize, retptr + 18, NULL);
if (r == 0 || r > bufsize) if (r == 0 || r > bufsize)
elog(FATAL, "could not generate full pathname for datadir %s: %lu", elog(FATAL, "could not generate full pathname for datadir %s: %lu",
DataDir, GetLastError()); DataDir, GetLastError());
for (cp = retptr; *cp; cp++) for (cp = retptr + 18; *cp; cp++)
if (*cp == '\\') if (*cp == '\\')
*cp = '/'; *cp = '/';