[Mplayer-cvslog] CVS: main/input input.c,1.52,1.53

[Arpi of Ize]

Update of /cvsroot/mplayer/main/input
In directory mail:/var/tmp.root/cvs-serv10032

Modified Files:
	input.c 
Log Message:
better error handling
based on patch by Jindrich Makovicka <makovick at kmlinux.fjfi.cvut.cz>


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- input.c	23 Oct 2002 22:23:12 -0000	1.52
+++ input.c	25 Oct 2002 14:58:30 -0000	1.53
@@ -542,6 +542,8 @@
 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 @@
   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;
   }