database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-02 09:02:37 +03:00
Code Activity

Fix error message on short read of pg_control

Browse Source 
Instead of saying "error: success", indicate that we got a working read
but it was too short.
This commit is contained in:
Magnus Hagander
2018-05-18 17:52:18 +02:00
parent a194106c1b
commit cfb758b6d9
2 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/common/controldata_utils.c
View File

@ -44,6 +44,7 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p)
int fd;
char ControlFilePath[MAXPGPATH];
pg_crc32c crc;
int r;
AssertArg(crc_ok_p);
@ -64,18 +65,34 @@ get_controlfile(const char *DataDir, const char *progname, bool *crc_ok_p)
}
#endif
if (read(fd, ControlFile, sizeof(ControlFileData)) != sizeof(ControlFileData))
#ifndef FRONTEND
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not read file \"%s\": %m", ControlFilePath)));
#else
r = read(fd, ControlFile, sizeof(ControlFileData));
if (r != sizeof(ControlFileData))
{
fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
progname, ControlFilePath, strerror(errno));
exit(EXIT_FAILURE);
}
if (r < 0)
#ifndef FRONTEND
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not read file \"%s\": %m", ControlFilePath)));
#else
{
fprintf(stderr, _("%s: could not read file \"%s\": %s\n"),
progname, ControlFilePath, strerror(errno));
exit(EXIT_FAILURE);
}
#endif
else
#ifndef FRONTEND
ereport(ERROR,
(errmsg("could not read file \"%s\": read %d bytes, expected %d",
ControlFilePath, r, (int) sizeof(ControlFileData))));
#else
{
fprintf(stderr, _("%s: could not read file \"%s\": read %d bytes, expected %d\n"),
progname, ControlFilePath, r, (int) sizeof(ControlFileData));
exit(EXIT_FAILURE);
}
#endif
}
close(fd);