2007-07-05 Roland McGrath <roland@redhat.com>

* file.c (sys_utime): Use personality_wordsize to handle biarch.
	Fixes RH#247185.
This commit is contained in:
Roland McGrath 2007-07-05 20:31:58 +00:00
parent 57dd0cb90e
commit 7e9817c1bf

24
file.c
View File

@ -2124,7 +2124,10 @@ int
sys_utime(tcp)
struct tcb *tcp;
{
long ut[2];
union {
long utl[2];
int uti[2];
} u;
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[0]);
@ -2133,13 +2136,22 @@ struct tcb *tcp;
tprintf("NULL");
else if (!verbose(tcp))
tprintf("%#lx", tcp->u_arg[1]);
else if (umoven(tcp, tcp->u_arg[1], sizeof ut,
(char *) ut) < 0)
else if (umoven(tcp, tcp->u_arg[1],
2 * personality_wordsize[current_personality],
(char *) &u) < 0)
tprintf("[?, ?]");
else {
tprintf("[%s,", sprinttime(ut[0]));
tprintf(" %s]", sprinttime(ut[1]));
else if (personality_wordsize[current_personality]
== sizeof u.utl[0]) {
tprintf("[%s,", sprinttime(u.utl[0]));
tprintf(" %s]", sprinttime(u.utl[1]));
}
else if (personality_wordsize[current_personality]
== sizeof u.uti[0]) {
tprintf("[%s,", sprinttime(u.uti[0]));
tprintf(" %s]", sprinttime(u.uti[1]));
}
else
abort();
}
return 0;
}