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

Dying suddenly with abort() is rude, avoid if possible

Browse Source 
* file.c (sys_utime): Don't call abort() if wordsize is strange.
Instead, warn user about it.
* desc.c (printflock): Use the same message string as in sys_utime.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2013-02-08 15:34:46 +01:00
parent 86d94843cf
commit 751acb3d70
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
desc.c
View File

@ -267,7 +267,7 @@ printflock(struct tcb *tcp, long addr, int getlk)
fl.l_pid = fl32.l_pid;
} else {
/* let people know we have a problem here */
tprintf("{ <decode error: unsupported wordsize %d> }",
tprintf("<decode error: unsupported wordsize %d>",
current_wordsize);
return;
}

8
file.c
View File

@ -2121,12 +2121,15 @@ sys_utime(struct tcb *tcp)
union {
long utl[2];
int uti[2];
long paranoia_for_huge_wordsize[4];
} u;
unsigned wordsize = current_wordsize;
unsigned wordsize;
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[0]);
tprints(", ");
wordsize = current_wordsize;
if (!tcp->u_arg[1])
tprints("NULL");
else if (!verbose(tcp))
@ -2142,7 +2145,8 @@ sys_utime(struct tcb *tcp)
tprintf(" %s]", sprinttime(u.uti[1]));
}
else
abort();
tprintf("<decode error: unsupported wordsize %d>",
wordsize);
}
return 0;
}