commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] Debian GNU Hurd packaging branch, master, updated. debian/20111106


From: Samuel Thibault
Subject: [SCM] Debian GNU Hurd packaging branch, master, updated. debian/20111106-1-43-gcf5a1c2
Date: Tue, 06 Dec 2011 00:48:35 +0000

The following commit has been merged in the master branch:
commit a9dae4d97b82b35ba3e03960255b605b260d1208
Author: Samuel Thibault <address@hidden>
Date:   Mon Nov 28 11:20:12 2011 +0100

    Fix select on pfinet tunnel and streamio
    
    * pfinet/tunnel.c (trivfs_S_io_select): Do not return EINVAL on SELECT_URG.
    * trans/streamio.c (trivfs_S_io_select): Likewise.

diff --git a/pfinet/tunnel.c b/pfinet/tunnel.c
index c4f9580..ec96861 100644
--- a/pfinet/tunnel.c
+++ b/pfinet/tunnel.c
@@ -469,8 +469,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   tdev = (struct tunnel_device *) cred->po->cntl->hook;
 
   /* We only deal with SELECT_READ here.  */
-  if (*type & ~SELECT_READ)
-    return EINVAL;
+  *type &= SELECT_READ;
 
   if (*type == 0)
     return 0;
diff --git a/trans/streamio.c b/trans/streamio.c
index 0faa8a3..c563c03 100644
--- a/trans/streamio.c
+++ b/trans/streamio.c
@@ -554,8 +554,7 @@ trivfs_S_io_select (struct trivfs_protid *cred,
   if (!(cred->po->openmodes & O_WRITE) && (*type & SELECT_WRITE))
     return EBADF;
 
-  if (*type & ~(SELECT_READ | SELECT_WRITE))
-    return EINVAL;
+  *type &= SELECT_READ | SELECT_WRITE;
 
   if (*type == 0)
     return 0;

-- 
Debian GNU Hurd packaging



reply via email to

[Prev in Thread] Current Thread [Next in Thread]