From 751acb3d70ebefcde1b71fb2ab61a3cffd2e7c4b Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Fri, 8 Feb 2013 15:34:46 +0100 Subject: [PATCH] Dying suddenly with abort() is rude, avoid if possible * 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 --- desc.c | 2 +- file.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/desc.c b/desc.c index e75ed4f3..9870e9cb 100644 --- a/desc.c +++ b/desc.c @@ -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("{ }", + tprintf("", current_wordsize); return; } diff --git a/file.c b/file.c index 1cd8d3c0..151fc31c 100644 --- a/file.c +++ b/file.c @@ -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("", + wordsize); } return 0; } -- 2.50.1