Revision
23293
Author
zarzycki@apple.com
Date
2007-07-03 12:53:19 -0700 (Tue, 03 Jul 2007)

Log Message

<rdar://problem/5247777> STD:VSC nohup tests failing

Modified Paths

Diff

Modified: trunk/launchd/src/libvproc.c (23292 => 23293)


--- trunk/launchd/src/libvproc.c	2007-07-03 17:31:02 UTC (rev 23292)
+++ trunk/launchd/src/libvproc.c	2007-07-03 19:53:19 UTC (rev 23293)
@@ -158,10 +158,13 @@
 		return (vproc_err_t)_vprocmgr_move_subset_to_user;
 	}
 
-	if (vproc_swap_complex(NULL, VPROC_GSK_ENVIRONMENT, NULL, &output_obj) == NULL) {
-		if (launch_data_get_type(output_obj) == LAUNCH_DATA_DICTIONARY) {
-			launch_data_dict_iterate(output_obj, setup_env_hack, NULL);
-			launch_data_free(output_obj);
+	/* XXX We need to give 'nohup' a better API after Leopard ships */
+	if (getprogname() && strcmp(getprogname(), "nohup") != 0) {
+		if (vproc_swap_complex(NULL, VPROC_GSK_ENVIRONMENT, NULL, &output_obj) == NULL) {
+			if (launch_data_get_type(output_obj) == LAUNCH_DATA_DICTIONARY) {
+				launch_data_dict_iterate(output_obj, setup_env_hack, NULL);
+				launch_data_free(output_obj);
+			}
 		}
 	}