github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-24 07:33:46 +01:00
Code Releases Activity

better error handling

Browse Source 
based on patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7912 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-10-25 14:58:30 +00:00
parent 0bb18f0541
commit 16fca14336
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
input/input.c
View File

@ -542,6 +542,8 @@ static int
mp_input_read_cmd(mp_input_fd_t* mp_fd, char** ret) {
char* end;
(*ret) = NULL;
if(mp_fd->flags & MP_FD_DEAD) return MP_INPUT_NOTHING;
// Allocate the buffer if it dont exist
if(!mp_fd->buffer) {
@ -554,18 +556,21 @@ mp_input_read_cmd(mp_input_fd_t* mp_fd, char** ret) {
while( !(mp_fd->flags & MP_FD_GOT_CMD) && !(mp_fd->flags & MP_FD_EOF) && (mp_fd->size - mp_fd->pos > 1) ) {
int r = ((mp_cmd_func_t)mp_fd->read_func)(mp_fd->fd,mp_fd->buffer+mp_fd->pos,mp_fd->size - 1 - mp_fd->pos);
// Error ?
if(r == MP_INPUT_NOTHING) break;
if(r < 0) {
if(errno == EINTR)
continue;
else if(errno == EAGAIN)
break;
mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading cmd fd %d : %s\n",mp_fd->fd,strerror(errno));
return MP_INPUT_ERROR;
mp_msg(MSGT_INPUT,MSGL_WARN,"Error while reading cmd fd %d : %s\n",mp_fd->fd,strerror(errno));
return r; // MP_INPUT_ERROR or MP_INPUT_DEAD
// EOF ?
} else if(r == 0) {
}
if(r == 0) {
mp_fd->flags |= MP_FD_EOF;
break;
}
// r > 0
mp_fd->pos += r;
break;
}