uintptr_t old_sp, old_ip;
long r;
- if (!libc.threaded || (self = __pthread_self())->canceldisable)
+ if (!libc.main_thread || (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
self->cp_ip = old_ip;
self->cp_sp = old_sp;
- if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
+ if (r==-EINTR && nr!=SYS_close && self->cancel && !self->canceldisable)
+ __cancel();
return r;
}
void __testcancel()
{
- pthread_t self = __pthread_self();
+ pthread_t self = pthread_self();
if (self->cancel && !self->canceldisable)
__cancel();
}