Add helper functions to clear/restore syserror

* defs.h (temporarily_clear_syserror, restore_cleared_syserror):
New prototypes.
* syscall.c (saved_u_error): New variable.
(temporarily_clear_syserror, restore_cleared_syserror): New functions.
* aio.c (sys_io_getevents): Use temporarily_clear_syserror
and restore_cleared_syserror.
* mq.c (sys_mq_timedreceive): Likewise.
* signal.c (sys_rt_sigtimedwait): Likewise.

1 files changed, 7 insertions, 0 deletions

diff --git a/mq.c b/mq.c
index ca0cfdaf2..a0af21158 100644
--- a/mq.c
+++ b/mq.c
@@ -59,7 +59,14 @@ SYS_FUNC(mq_timedreceive)
 	else {
 		printstr(tcp, tcp->u_arg[1], tcp->u_arg[2]);
 		tprintf(", %lu, %ld, ", tcp->u_arg[2], tcp->u_arg[3]);
+		/*
+		 * Since the timeout parameter is read by the kernel
+		 * on entering syscall, it has to be decoded the same way
+		 * whether the syscall has failed or not.
+		 */
+		temporarily_clear_syserror(tcp);
 		printtv(tcp, tcp->u_arg[4]);
+		restore_cleared_syserror(tcp);
 	}
 	return 0;
 }