mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-01-12 18:34:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve reporting of error situations in find_other_exec().

Browse Source 
This function suppressed any stderr output from the called program, which
is unnecessary in the normal case and unhelpful in error cases.  It also
gave a rather opaque message along the lines of "fgets failure: Success"
in case the called program failed to return anything on stdout.  Since
we've seen multiple reports of people not understanding what's wrong when
pg_ctl reports this, improve the message.

Back-patch to all active branches.
This commit is contained in:
Tom Lane 2012-07-27 19:31:28 -04:00
parent 3262b196aa
commit 73162ee6be
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/port/exec.c
View File

@ -322,7 +322,7 @@ find_other_exec(const char *argv0, const char *target,
if (validate_exec(retpath) != 0) if (validate_exec(retpath) != 0)
return -1; return -1;
snprintf(cmd, sizeof(cmd), "\"%s\" -V 2>%s", retpath, DEVNULL); snprintf(cmd, sizeof(cmd), "\"%s\" -V", retpath);
if (!pipe_read_line(cmd, line, sizeof(line))) if (!pipe_read_line(cmd, line, sizeof(line)))
return -1; return -1;
@ -352,12 +352,21 @@ pipe_read_line(char *cmd, char *line, int maxsize)
fflush(stdout); fflush(stdout);
fflush(stderr); fflush(stderr);
errno = 0;
if ((pgver = popen(cmd, "r")) == NULL) if ((pgver = popen(cmd, "r")) == NULL)
{
perror("popen failure");
return NULL; return NULL;
}
errno = 0;
if (fgets(line, maxsize, pgver) == NULL) if (fgets(line, maxsize, pgver) == NULL)
{ {
perror("fgets failure"); if (feof(pgver))
fprintf(stderr, "no data was returned by command \"%s\"\n", cmd);
else
perror("fgets failure");
pclose(pgver); /* no error checking */
return NULL; return NULL;
} }