X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Flinux%2Fwait4.c;h=83650e34a860cccaf76c0b2aa102235b4114a9ba;hb=0b0640219338b80cf47026d1970b5503414ed7f3;hp=5dd505a987c0a764e9482e718081300a2e64e774;hpb=9b235e8374bfe15f73d470b4ad7d1c579fd9a71e;p=musl

diff --git a/src/linux/wait4.c b/src/linux/wait4.c
index 5dd505a9..83650e34 100644
--- a/src/linux/wait4.c
+++ b/src/linux/wait4.c
@@ -1,18 +1,39 @@
+#define _GNU_SOURCE
 #include <sys/wait.h>
 #include <sys/resource.h>
 #include <string.h>
+#include <errno.h>
 #include "syscall.h"
 
-pid_t wait4(pid_t pid, int *status, int options, struct rusage *usage)
+pid_t wait4(pid_t pid, int *status, int options, struct rusage *ru)
 {
-	pid_t ret = syscall4(__NR_wait4, pid, (long)status, options, (long)usage);
-	/* Fixup kernel time_t... */
-	if (usage) {
-		long kusage[4];
-		memcpy(kusage, usage, sizeof kusage);
-		memmove((struct timeval *)usage + 2, (long *)usage + 4, sizeof *usage - 2*sizeof(struct timeval));
-		usage->ru_utime = (struct timeval){ kusage[0], kusage[1] };
-		usage->ru_stime = (struct timeval){ kusage[2], kusage[3] };
+	int r;
+#ifdef SYS_wait4_time64
+	if (ru) {
+		long long kru64[18];
+		r = __syscall(SYS_wait4_time64, pid, status, options, kru64);
+		if (!r) {
+			ru->ru_utime = (struct timeval)
+				{ .tv_sec = kru64[0], .tv_usec = kru64[1] };
+			ru->ru_stime = (struct timeval)
+				{ .tv_sec = kru64[2], .tv_usec = kru64[3] };
+			char *slots = (char *)&ru->ru_maxrss;
+			for (int i=0; i<14; i++)
+				*(long *)(slots + i*sizeof(long)) = kru64[4+i];
+		}
+		if (SYS_wait4_time64 == SYS_wait4 || r != -ENOSYS)
+			return __syscall_ret(r);
 	}
-	return ret;
+#endif
+	char *dest = ru ? (char *)&ru->ru_maxrss - 4*sizeof(long) : 0;
+	r = __syscall(SYS_wait4, pid, status, options, dest);
+	if (r>0 && ru && sizeof(time_t) > sizeof(long)) {
+		long kru[4];
+		memcpy(kru, dest, 4*sizeof(long));
+		ru->ru_utime = (struct timeval)
+			{ .tv_sec = kru[0], .tv_usec = kru[1] };
+		ru->ru_stime = (struct timeval)
+			{ .tv_sec = kru[2], .tv_usec = kru[3] };
+	}
+	return __syscall_ret(r);
 }