glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Print offsets in lseek and _llseek syscalls as signed integers

Browse Source 
* lseek.c (SYS_FUNC(lseek)): Print offset using %lld format.
(SYS_FUNC(llseek)): Likewise.  Treat high and low components of offset
as unsigned long integers.
* tests/llseek.c (main): Check that negative offset is printed properly.
* tests/lseek.c (main): Likewise.
This commit is contained in:
Дмитрий Левин 2016-02-15 18:30:02 +00:00
parent 669f8cfb42
commit ddbede5d9c
3 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
lseek.c
View File

@ -7,7 +7,7 @@
* Copyright (c) 2009 Andreas Schwab <schwab@redhat.com>
* Copyright (c) 2012 H.J. Lu <hongjiu.lu@intel.com>
* Copyright (c) 2013 Denys Vlasenko <vda.linux@googlemail.com>
* Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
* Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@ -47,10 +47,9 @@
#if defined(LINUX_MIPSN32) || defined(X32)
SYS_FUNC(lseek)
{
long long offset;
int whence;
printfd(tcp, tcp->u_arg[0]);
long long offset;
# ifdef X32
/* tcp->ext_arg is not initialized for i386 personality */
if (current_personality == 1)
@ -58,11 +57,9 @@ SYS_FUNC(lseek)
else
# endif
offset = tcp->ext_arg[1];
whence = tcp->u_arg[2];
if (whence == SEEK_SET)
tprintf(", %llu, ", offset);
else
tprintf(", %lld, ", offset);
int whence = tcp->u_arg[2];
tprintf(", %lld, ", offset);
printxval(whence_codes, whence, "SEEK_???");
return RVAL_DECODED | RVAL_LUDECIMAL;
@ -70,16 +67,23 @@ SYS_FUNC(lseek)
#else
SYS_FUNC(lseek)
{
long offset;
int whence;
printfd(tcp, tcp->u_arg[0]);
offset = tcp->u_arg[1];
whence = tcp->u_arg[2];
if (whence == SEEK_SET)
tprintf(", %lu, ", offset);
else
tprintf(", %ld, ", offset);
long offset =
# if SUPPORTED_PERSONALITIES > 1 && SIZEOF_LONG > 4
# ifdef X86_64
current_personality == 1 ?
(long)(int) tcp->u_arg[1] : tcp->u_arg[1];
# else
current_wordsize == 4 ?
(long)(int) tcp->u_arg[1] : tcp->u_arg[1];
# endif
# else
tcp->u_arg[1];
# endif
int whence = tcp->u_arg[2];
tprintf(", %ld, ", offset);
printxval(whence_codes, whence, "SEEK_???");
return RVAL_DECODED | RVAL_UDECIMAL;
@ -103,14 +107,9 @@ SYS_FUNC(llseek)
{
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
if (tcp->u_arg[4] == SEEK_SET)
tprintf(", %llu, ",
((long long) tcp->u_arg[1]) << 32 |
(unsigned long long) (unsigned) tcp->u_arg[2]);
else
tprintf(", %lld, ",
((long long) tcp->u_arg[1]) << 32 |
(unsigned long long) (unsigned) tcp->u_arg[2]);
tprintf(", %lld, ",
((unsigned long long) (unsigned long) tcp->u_arg[1]) << 32
| (unsigned long long) (unsigned long) tcp->u_arg[2]);
} else {
printnum_int64(tcp, tcp->u_arg[3], "%" PRIu64);
tprints(", ");

6
tests/llseek.c
View File

@ -38,16 +38,16 @@
int
main(void)
{
const unsigned long high = 0xdefaced;
const unsigned long high = 0xfacefeed;
const unsigned long low = 0xdeadbeef;
const unsigned long long offset = 0xdefaceddeadbeef;
const long long offset = 0xfacefeeddeadbeefLL;
unsigned long long result;
assert(syscall(__NR__llseek, -1, high, low, &result, SEEK_SET) == -1);
if (EBADF != errno)
perror_msg_and_skip("_llseek");
printf("_llseek(-1, %llu, %p, SEEK_SET) = -1 EBADF (%m)\n",
printf("_llseek(-1, %lld, %p, SEEK_SET) = -1 EBADF (%m)\n",
offset, &result);
puts("+++ exited with 0 +++");

10
tests/lseek.c
View File

@ -39,7 +39,7 @@
int
main(void)
{
const kernel_ulong_t offset = (kernel_ulong_t) 0xdefaced0badc0deULL;
const kernel_ulong_t offset = (kernel_ulong_t) 0xfacefeeddeadbeefULL;
if (sizeof(offset) > sizeof(long))
assert(lseek(-1, offset, SEEK_SET) == -1);
@ -49,8 +49,12 @@ main(void)
if (EBADF != errno)
perror_msg_and_skip("lseek");
printf("lseek(-1, %llu, SEEK_SET) = -1 EBADF (%m)\n",
(unsigned long long) offset);
if (sizeof(offset) > sizeof(long))
printf("lseek(-1, %lld, SEEK_SET) = -1 EBADF (%m)\n",
(long long) offset);
else
printf("lseek(-1, %ld, SEEK_SET) = -1 EBADF (%m)\n",
(long) offset);
puts("+++ exited with 0 +++");
return 0;