diff options
| author | raf <none@none> | 2008-01-23 12:00:31 -0800 |
|---|---|---|
| committer | raf <none@none> | 2008-01-23 12:00:31 -0800 |
| commit | a574db851cdc636fc3939b68e80d79fe7fbd57f2 (patch) | |
| tree | 7a28122042d1d24d9c4df92ba257e2d34d111e2e /usr/src/lib/libc/port/gen/getutx.c | |
| parent | 4a7ceb24cfcc0a97f96d86cfe5852ae445b50e57 (diff) | |
| download | illumos-gate-a574db851cdc636fc3939b68e80d79fe7fbd57f2.tar.gz | |
6598890 cancellation code abuses synonyms
--HG--
rename : usr/src/lib/libc/amd64/crt/cerror64.s => deleted_files/usr/src/lib/libc/amd64/crt/cerror64.s
rename : usr/src/lib/libc/port/gen/wait3.c => deleted_files/usr/src/lib/libc/port/gen/wait3.c
rename : usr/src/lib/libc/port/gen/wait4.c => deleted_files/usr/src/lib/libc/port/gen/wait4.c
rename : usr/src/lib/libc/port/sys/fsync.c => deleted_files/usr/src/lib/libc/port/sys/fsync.c
rename : usr/src/lib/libc/sparc/sys/syssun.s => deleted_files/usr/src/lib/libc/sparc/sys/syssun.s
rename : usr/src/lib/libc/common/sys/__fcntl.s => usr/src/lib/libc/common/sys/fcntl.s
rename : usr/src/lib/libc/common/sys/_rename.s => usr/src/lib/libc/common/sys/rename.s
rename : usr/src/lib/libc/port/gen/rename.c => usr/src/lib/libc/port/gen/remove.c
rename : usr/src/lib/libc/port/sys/fcntl.c => usr/src/lib/libc/port/sys/libc_fcntl.c
Diffstat (limited to 'usr/src/lib/libc/port/gen/getutx.c')
| -rw-r--r-- | usr/src/lib/libc/port/gen/getutx.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr/src/lib/libc/port/gen/getutx.c b/usr/src/lib/libc/port/gen/getutx.c index 3d8e69cf4e..fe0da52342 100644 --- a/usr/src/lib/libc/port/gen/getutx.c +++ b/usr/src/lib/libc/port/gen/getutx.c @@ -20,7 +20,7 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -82,6 +82,7 @@ #include <ctype.h> #include <stdlib.h> #include <sys/wait.h> +#include <pthread.h> #include <limits.h> #include <signal.h> #include <spawn.h> @@ -508,6 +509,7 @@ invoke_utmp_update(const struct utmpx *entryx) posix_spawnattr_t attr; int status; + int cancel_state; pid_t child; pid_t w; int i; @@ -587,9 +589,11 @@ invoke_utmp_update(const struct utmpx *entryx) goto out; } + (void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state); do { w = waitpid(child, &status, 0); } while (w == -1 && errno == EINTR); + (void) pthread_setcancelstate(cancel_state, NULL); /* * We can get ECHILD if the process is ignoring SIGCLD. |