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

1 files changed, 7 insertions, 6 deletions

diff --git a/usr/src/lib/libc/port/stdio/system.c b/usr/src/lib/libc/port/stdio/system.c
index 707134751d..cef2648ced 100644
--- a/usr/src/lib/libc/port/stdio/system.c
+++ b/usr/src/lib/libc/port/stdio/system.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -73,11 +73,14 @@ void *
 reapchild(void *arg)
 {
 	pid_t pid = (pid_t)(uintptr_t)arg;
+	int cancel_state;
 
+	(void) pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cancel_state);
 	while (waitpid(pid, NULL, 0) == -1) {
 		if (errno != EINTR)
 			break;
 	}
+	(void) pthread_setcancelstate(cancel_state, NULL);
 	return (NULL);
 }
 
@@ -225,7 +228,7 @@ system(const char *cmd)
 	argv[3] = NULL;
 	if (error == 0)
 		error = posix_spawn(&cu.pid, shpath, NULL, &attr,
-			(char *const *)argv, (char *const *)environ);
+		    (char *const *)argv, (char *const *)environ);
 
 	(void) posix_spawnattr_destroy(&attr);
 
@@ -234,13 +237,11 @@ system(const char *cmd)
 		status = -1;
 	} else {
 		/*
-		 * system() is a cancellation point.
-		 * Call waitpid_cancel() rather than _waitpid() to make
-		 * sure that we actually perform the cancellation logic.
+		 * system() is a cancellation point and so is waitpid().
 		 */
 		pthread_cleanup_push(cleanup, &cu);
 		do {
-			w = waitpid_cancel(cu.pid, &status, 0);
+			w = waitpid(cu.pid, &status, 0);
 		} while (w == -1 && errno == EINTR);
 		pthread_cleanup_pop(0);
 		if (w == -1)