From: Roland McGrath <roland@redhat.com>
Date: Tue, 19 Oct 2004 22:59:55 +0000 (+0000)
Subject: 2004-10-19  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~488
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8c304bcc002344f7bbe8d993aff62e027f086733;p=strace

2004-10-19  Roland McGrath  <roland@redhat.com>

	* file.c (sys_llseek): Revert last change.
---

diff --git a/file.c b/file.c
index 2f1275a4..8496ab04 100644
--- a/file.c
+++ b/file.c
@@ -431,12 +431,19 @@ sys_llseek (tcp)
 struct tcb *tcp;
 {
     if (entering(tcp)) {
+	/*
+	 * This one call takes explicitly two 32-bit arguments hi, lo,
+	 * rather than one 64-bit argument for which LONG_LONG works
+	 * appropriate for the native byte order.
+	 */
 	if (tcp->u_arg[4] == SEEK_SET)
 	    tprintf("%ld, %llu, ", tcp->u_arg[0],
-		    LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]));
+		    (((long long int) tcp->u_arg[1]) << 32
+		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
 	else
 	    tprintf("%ld, %lld, ", tcp->u_arg[0],
-		    LONG_LONG(tcp->u_arg[1], tcp->u_arg[2]));
+		    (((long long int) tcp->u_arg[1]) << 32
+		     | (unsigned long long) (unsigned) tcp->u_arg[2]));
     }
     else {
 	long long int off;