|
7 | 7 | * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group |
8 | 8 | * Portions Copyright (c) 1994, Regents of the University of California |
9 | 9 | * |
10 | | - * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.98 2002/06/20 20:29:25 momjian Exp $ |
| 10 | + * $Header: /cvsroot/pgsql/src/backend/access/transam/xlog.c,v 1.99 2002/08/04 06:53:10 thomas Exp $ |
11 | 11 | * |
12 | 12 | *------------------------------------------------------------------------- |
13 | 13 | */ |
@@ -389,7 +389,7 @@ static ControlFileData *ControlFile = NULL; |
389 | 389 |
|
390 | 390 |
|
391 | 391 | /* File path names */ |
392 | | -staticcharXLogDir[MAXPGPATH]; |
| 392 | +staticcharXLogDir[MAXPGPATH]=""; |
393 | 393 | staticcharControlFilePath[MAXPGPATH]; |
394 | 394 |
|
395 | 395 | /* |
@@ -2065,11 +2065,28 @@ ValidXLOGHeader(XLogPageHeader hdr, int emode, bool checkSUI) |
2065 | 2065 | * I/O and compatibility-check functions, but there seems no need currently. |
2066 | 2066 | */ |
2067 | 2067 |
|
| 2068 | +void |
| 2069 | +SetXLogDir(char*path) |
| 2070 | +{ |
| 2071 | +if (path!=NULL) |
| 2072 | +{ |
| 2073 | +if (strlen(path) >=MAXPGPATH) |
| 2074 | +elog(FATAL,"XLOG path '%s' is too long" |
| 2075 | +"; maximum length is %d characters",path,MAXPGPATH-1); |
| 2076 | +strcpy(XLogDir,path); |
| 2077 | +} |
| 2078 | +else |
| 2079 | +{ |
| 2080 | +snprintf(XLogDir,MAXPGPATH,"%s/pg_xlog",DataDir); |
| 2081 | +} |
| 2082 | +} |
| 2083 | + |
2068 | 2084 | void |
2069 | 2085 | XLOGPathInit(void) |
2070 | 2086 | { |
2071 | 2087 | /* Init XLOG file paths */ |
2072 | | -snprintf(XLogDir,MAXPGPATH,"%s/pg_xlog",DataDir); |
| 2088 | +if (strlen(XLogDir) <=0) |
| 2089 | +SetXLogDir(NULL); |
2073 | 2090 | snprintf(ControlFilePath,MAXPGPATH,"%s/global/pg_control",DataDir); |
2074 | 2091 | } |
2075 | 2092 |
|
|
