diff options
Diffstat (limited to 'src/backend/utils')
| -rw-r--r-- | src/backend/utils/cache/relcache.c | 5 | ||||
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 21 | ||||
| -rw-r--r-- | src/backend/utils/misc/guc.c | 13 |
3 files changed, 32 insertions, 7 deletions
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c index 797d96ca8ec..fa8e2ac4d7b 100644 --- a/src/backend/utils/cache/relcache.c +++ b/src/backend/utils/cache/relcache.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.194 2003/12/28 21:57:37 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.195 2004/01/26 22:35:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -3330,7 +3330,8 @@ write_relcache_init_file(void) MemoryContextSwitchTo(oldcxt); } - FreeFile(fp); + if (FreeFile(fp)) + elog(FATAL, "could not write init file"); /* * Now we have to check whether the data we've so painstakingly diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index b2ed8a58d32..98de05c0b8f 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.119 2004/01/08 06:01:21 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.120 2004/01/26 22:35:32 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -622,7 +622,16 @@ CreateLockFile(const char *filename, bool amPostmaster, (errcode_for_file_access(), errmsg("could not write lock file \"%s\": %m", filename))); } - close(fd); + if (close(fd)) + { + int save_errno = errno; + + unlink(filename); + errno = save_errno; + ereport(FATAL, + (errcode_for_file_access(), + errmsg("could not write lock file \"%s\": %m", filename))); + } /* * Arrange for automatic removal of lockfile at proc_exit. @@ -776,7 +785,13 @@ RecordSharedMemoryInLockFile(unsigned long id1, unsigned long id2) close(fd); return; } - close(fd); + if (close(fd)) + { + ereport(LOG, + (errcode_for_file_access(), + errmsg("could not write to file \"%s\": %m", + directoryLockFile))); + } } diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c index 7b3bde2d0c2..33fd1e82ba6 100644 --- a/src/backend/utils/misc/guc.c +++ b/src/backend/utils/misc/guc.c @@ -10,7 +10,7 @@ * Written by Peter Eisentraut <peter_e@gmx.net>. * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.180 2004/01/24 20:00:45 wieck Exp $ + * $PostgreSQL: pgsql/src/backend/utils/misc/guc.c,v 1.181 2004/01/26 22:35:32 tgl Exp $ * *-------------------------------------------------------------------- */ @@ -3971,7 +3971,16 @@ write_nondefault_variables(GucContext context) } } - FreeFile(fp); + if (FreeFile(fp)) + { + free(new_filename); + free(filename); + ereport(elevel, + (errcode_for_file_access(), + errmsg("could not write to file \"%s\": %m", CONFIG_EXEC_PARAMS))); + return; + } + /* Put new file in place, this could delay on Win32 */ rename(new_filename, filename); free(new_filename); |