diff options
author | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-26 22:35:32 +0000 |
---|---|---|
committer | Tom Lane <tgl@sss.pgh.pa.us> | 2004-01-26 22:35:32 +0000 |
commit | c77f363384c3f4a6bbc73f501d2459e94382a30b (patch) | |
tree | c722b460526c687c1ec9c546aed71b52fbcb3cc4 /src/backend/utils/init/miscinit.c | |
parent | e0707cbae9cb5360cd044231fda921fffe8095c5 (diff) | |
download | postgresql-c77f363384c3f4a6bbc73f501d2459e94382a30b.tar.gz postgresql-c77f363384c3f4a6bbc73f501d2459e94382a30b.zip |
Ensure that close() and fclose() are checked for errors, at least in
cases involving writes. Per recent discussion about the possibility
of close-time failures on some filesystems. There is a TODO item for
this, too.
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
-rw-r--r-- | src/backend/utils/init/miscinit.c | 21 |
1 files changed, 18 insertions, 3 deletions
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))); + } } |