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