mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In pipe_read_line Windows code, loop to ensure we get a whole line

Browse Source 
from the child process; fixes observed problems when the returned
version number is '8.0.0' rather than '8.0.0rc1'.  Magnus Hagander
This commit is contained in:
Tom Lane 2004-12-20 17:40:59 +00:00
parent da59a70c09
commit 80855ba8ca
1 changed files with 34 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/port/exec.c
View File

@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/port/exec.c,v 1.33 2004/11/27 22:44:15 petere Exp $ * $PostgreSQL: pgsql/src/port/exec.c,v 1.34 2004/12/20 17:40:59 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -486,30 +486,45 @@ pipe_read_line(char *cmd, char *line, int maxsize)
&si, &si,
&pi)) &pi))
{ {
DWORD bytesread = 0;
/* Successfully started the process */ /* Successfully started the process */
char *lineptr;
ZeroMemory(line, maxsize); ZeroMemory(line, maxsize);
/* Try to read at least one line from the pipe */
/* This may require more than one wait/read attempt */
for (lineptr = line; lineptr < line+maxsize-1; )
{
DWORD bytesread = 0;
/* Let's see if we can read */ /* Let's see if we can read */
if (WaitForSingleObject(childstdoutrddup, 10000) != WAIT_OBJECT_0) if (WaitForSingleObject(childstdoutrddup, 10000) != WAIT_OBJECT_0)
{ break; /* Timeout, but perhaps we got a line already */
/* Got timeout */
CloseHandle(pi.hProcess); if (!ReadFile(childstdoutrddup, lineptr, maxsize-(lineptr-line),
CloseHandle(pi.hThread); &bytesread, NULL))
CloseHandle(childstdoutwr); break; /* Error, but perhaps we got a line already */
CloseHandle(childstdoutrddup);
return NULL; lineptr += strlen(lineptr);
if (!bytesread)
break; /* EOF */
if (strchr(line, '\n'))
break; /* One or more lines read */
} }
/* We try just once */ if (lineptr != line)
if (ReadFile(childstdoutrddup, line, maxsize, &bytesread, NULL) &&
bytesread > 0)
{ {
/* So we read some data */ /* OK, we read some data */
int len = strlen(line); int len;
retval = line;
/* If we got more than one line, cut off after the first \n */
lineptr = strchr(line,'\n');
if (lineptr)
*(lineptr+1) = '\0';
len = strlen(line);
/* /*
* If EOL is \r\n, convert to just \n. Because stdout is a * If EOL is \r\n, convert to just \n. Because stdout is a
@ -531,6 +546,8 @@ pipe_read_line(char *cmd, char *line, int maxsize)
*/ */
if (len == 0 || line[len - 1] != '\n') if (len == 0 || line[len - 1] != '\n')
strcat(line, "\n"); strcat(line, "\n");
retval = line;
} }
CloseHandle(pi.hProcess); CloseHandle(pi.hProcess);