OS-3572 lxbrand fix various sigwaitinfo failures

TritonDataCenter · Nov 19, 2014 · e12924e · e12924e
1 parent 140d337
commit e12924e
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/usr/src/lib/brand/lx/lx_brand/common/signal.c b/usr/src/lib/brand/lx/lx_brand/common/signal.c
@@ -856,9 +856,9 @@ lx_rt_sigwaitinfo(uintptr_t set, uintptr_t sinfo, uintptr_t setsize)
 		return (-errno);
 
 	if (s_sinfop == NULL)
-		return (rc);
+		return (stol_signo[rc]);
 
-	return ((stol_siginfo(s_sinfop, sinfop) != 0) ? -errno : rc);
+	return ((stol_siginfo(s_sinfop, sinfop) != 0) ? -errno : stol_signo[rc]);
 }
 
 long
@@ -880,14 +880,18 @@ lx_rt_sigtimedwait(uintptr_t set, uintptr_t sinfo, uintptr_t toutp,
 
 	s_sinfop = (sinfop == NULL) ? NULL : &s_sinfo;
 
+	/*
+	 * "If timeout is the NULL pointer, the behavior is unspecified."
+	 * Match what LTP expects.
+	 */
 	if ((rc = sigtimedwait(&s_set, s_sinfop,
 	    (struct timespec *)toutp)) == -1)
-		return (-errno);
+		return (toutp == NULL ? -EINTR : -errno);
 
 	if (s_sinfop == NULL)
-		return (rc);
+		return (stol_signo[rc]);
 
-	return ((stol_siginfo(s_sinfop, sinfop) != 0) ? -errno : rc);
+	return ((stol_siginfo(s_sinfop, sinfop) != 0) ? -errno : stol_signo[rc]);
 }
 
 #if defined(_ILP32)