fixed signatures for several syscalls that return positive value in correct case

sysdeps/nacl/sysdep.h

 #ifndef _NACL_SYSDEP_H
 #define _NACL_SYSDEP_H 1
 
 #if !defined(__ASSEMBLER__)
 #include <futex_emulation.h>
 #include <irt_syscalls.h>
 #include <lowlevellock.h>
 
 /* Implementation of all syscalls for use in platform- and OS- independent code
    as inline functions.  Each function translates the syscall arguments into IRT
@@ skipping 222 matching lines @@
 __extern_always_inline int
 INTERNAL_SYSCALL_dup3_3 (int *err, int oldfd, int newfd, int flags)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_create_1 (int *err, int size)
 {
-  *err = __nacl_irt_epoll_create (size);
-  return 0;
+  int fd;
+  *err = __nacl_irt_epoll_create (size, &fd);
+  return fd;
 }
 
 __extern_always_inline int
+INTERNAL_SYSCALL_epoll_create1_1 (int *err, int flags)
+{
+  int fd;
+  *err = __nacl_irt_epoll_create1 (flags, &fd);
+  return fd;
+}
+
+__extern_always_inline int
 INTERNAL_SYSCALL_epoll_ctl_4 (int *err, int epfd, int op, int fd,
                               struct epoll_event *event)
 {
   *err = __nacl_irt_epoll_ctl (epfd, op, fd, event);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_pwait_6 (int *err, int epfd, struct epoll_event *events,
                                 int maxevents, int timeout,
                                 const sigset_t *sigmask, size_t sigset_size)
 {
+  int count;
   *err = __nacl_irt_epoll_pwait (epfd, events, maxevents, timeout, sigmask,
-                                 sigset_size);
-  return 0;
+                                 sigset_size, &count);
+  return count;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_execve_3 (int *err, const char *filename, char *const argv[],
                            char *const envp[])
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_epoll_wait_4 (int *err, int epfd, struct epoll_event *events,
                                int maxevents, int timeout)
 {
-  *err = (38 /* ENOSYS */);
-  *err = __nacl_irt_epoll_wait (epfd, events, maxevents, timeout);
-  return 0;
+  int count;
+  *err = __nacl_irt_epoll_wait (epfd, events, maxevents, timeout, &count);
+  return count;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_eventfd2_2 (int *err, unsigned int initval, int flags)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
@@ skipping 286 matching lines @@
   return 0;
 }
 
 /* NOTE! The user-level library version returns a character pointer.
 
    The system call just returns the length of the buffer filled (which includes
    the ending '\0' character), or zero in case of error.  */
 __extern_always_inline int
 INTERNAL_SYSCALL_getcwd_2 (int *err, char *buf, size_t size)
 {
-  int ret;
-  *err = __nacl_irt_getcwd (buf, size, &ret);
-  return ret;
+  int len;
+  *err = __nacl_irt_getcwd (buf, size, &len);
+  return len;
 }
 
 __extern_always_inline gid_t
 INTERNAL_SYSCALL_getegid_0 (int *err)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline uid_t
@@ skipping 553 matching lines @@
 INTERNAL_SYSCALL_pivot_root_2 (int *err, const char *new_root,
                                const char *put_old)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_poll_3 (int *err, struct pollfd *fds, nfds_t nfds, int timeout)
 {
-  *err = __nacl_irt_poll (fds, nfds, timeout);
-  return 0;
+  int count;
+  *err = __nacl_irt_poll (fds, nfds, timeout, &count);
+  return count;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_ppoll_5 (int *err, struct pollfd *fds, nfds_t nfds,
                           const struct timespec *timeout,
                           const sigset_t *sigmask, size_t sigset_size)
 {
-  *err = __nacl_irt_ppoll (fds, nfds, timeout, sigmask, sigset_size);
-  return 0;
+  int count;
+  *err = __nacl_irt_ppoll (fds, nfds, timeout, sigmask, sigset_size, &count);
+  return count;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_prctl_5 (int *err, int option, unsigned long arg2,
                           unsigned long arg3, unsigned long arg4,
                           unsigned long arg5)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_pselect6_6 (int *err, int nfds, fd_set *readfds,
                              fd_set *writefds, fd_set *exceptfds,
                              const struct timeval *timeout,
                              void *sigmask)
 {
+  int count;
   *err = __nacl_irt_pselect (nfds, readfds, writefds, exceptfds, timeout,
-                             sigmask);
-  return 0;
+                             sigmask, &count);
+  return count;
 }
 
 __extern_always_inline long
 INTERNAL_SYSCALL_ptrace_4 (int *err, enum __ptrace_request request, pid_t pid,
                            void *addr, void *data)
 {
   *err = (38 /* ENOSYS */);
   return 0;
 }
 
@@ skipping 214 matching lines @@
 }
 
 #ifdef __i386__
 #define INTERNAL_SYSCALL_select_5 INTERNAL_SYSCALL__newselect_5
 #endif
 __extern_always_inline int
 INTERNAL_SYSCALL_select_5 (int *err, int nfds, fd_set *readfds,
                            fd_set *writefds, fd_set *exceptfds,
                            const struct timeval *timeout)
 {
-  *err = __nacl_irt_select (nfds, readfds, writefds, exceptfds, timeout);
-  return 0;
+  int count;
+  *err = __nacl_irt_select (nfds, readfds, writefds, exceptfds, timeout, &count);
+  return count;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_semctl_4 (int *err, int semid, int semnum, int cmd,
 #ifdef _SEM_SEMUN_UNDEFINED
                            int semun)
 #else
                            union semun semun)
 #endif
 {
@@ skipping 200 matching lines @@
 __extern_always_inline int
 INTERNAL_SYSCALL_signalfd_3 (int *err, int fd, const sigset_t *mask,
                              size_t sigsetsize)
 {
   return INTERNAL_SYSCALL_signalfd4_4 (err, fd, mask, sigsetsize, 0);
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_socket_3 (int *err, int domain, int type, int protocol)
 {
-  *err = __nacl_irt_socket (domain, type, protocol);
-  return 0;
+  int sd;
+  *err = __nacl_irt_socket (domain, type, protocol, &sd);
+  return sd;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_accept_3 (int *err, int sockfd, struct sockaddr* addr,
                            socklen_t* addr_len)
 {
-  *err = __nacl_irt_accept (sockfd, addr, addr_len);
-  return 0;
+  int sd;
+  *err = __nacl_irt_accept (sockfd, addr, addr_len, &sd);
+  return sd;
 }
 
 __extern_always_inline int
 INTERNAL_SYSCALL_bind_3 (int *err, int sockfd, struct sockaddr* addr,
                          socklen_t addr_len)
 {
   *err = __nacl_irt_bind (sockfd, addr, addr_len);
   return 0;
 }
 
@@ skipping 562 matching lines @@
 #define PSEUDO_END_ERRVAL(name)                 \
   END (name)
 
 #undef SYSCALL_ERROR_HANDLER_TLS_STORE
 #define SYSCALL_ERROR_HANDLER_TLS_STORE(src, destoff)   \
   movl %gs:0, %eax;                                     \
   movl src, (%eax,destoff)
 
 #endif
 #endif