procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup related to bug #13546 with subprocesses on MS-Windows.

Browse source 
src/w32.c (sys_pipe): When failing due to file descriptors above
 MAXDESC, set errno to EMFILE.
 (_sys_read_ahead): Update cp->status when failing to read serial
 communications input, so that the status doesn't stay at
 STATUS_READ_IN_PROGRESS.
This commit is contained in:
Eli Zaretskii 2013-02-13 19:00:26 +02:00
parent a1d23eb505
commit 6e432f0cda
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-02-13 Eli Zaretskii <eliz@gnu.org>
* w32.c (sys_pipe): When failing due to file descriptors above
MAXDESC, set errno to EMFILE.
(_sys_read_ahead): Update cp->status when failing to read serial
communications input, so that the status doesn't stay at
STATUS_READ_IN_PROGRESS. (Bug#13546)
2013-02-13 Glenn Morris <rgm@gnu.org>
* keyboard.c (input-decode-map, key-translation-map): Doc fixes.

21
src/w32.c
View file

@ -6209,6 +6209,7 @@ sys_pipe (int * phandles)
{
_close (phandles[0]);
_close (phandles[1]);
errno = EMFILE;
rc = -1;
}
else
@ -6281,19 +6282,31 @@ _sys_read_ahead (int fd)
/* Configure timeouts for blocking read. */
if (!GetCommTimeouts (hnd, &ct))
return STATUS_READ_ERROR;
{
cp->status = STATUS_READ_ERROR;
return STATUS_READ_ERROR;
}
ct.ReadIntervalTimeout = 0;
ct.ReadTotalTimeoutMultiplier = 0;
ct.ReadTotalTimeoutConstant = 0;
if (!SetCommTimeouts (hnd, &ct))
return STATUS_READ_ERROR;
{
cp->status = STATUS_READ_ERROR;
return STATUS_READ_ERROR;
}
if (!ReadFile (hnd, &cp->chr, sizeof (char), (DWORD*) &rc, ovl))
{
if (GetLastError () != ERROR_IO_PENDING)
return STATUS_READ_ERROR;
{
cp->status = STATUS_READ_ERROR;
return STATUS_READ_ERROR;
}
if (!GetOverlappedResult (hnd, ovl, (DWORD*) &rc, TRUE))
return STATUS_READ_ERROR;
{
cp->status = STATUS_READ_ERROR;
return STATUS_READ_ERROR;
}
}
}
else if (fd_info[fd].flags & FILE_SOCKET)