summaryrefslogtreecommitdiff
path: root/Xtrans.c
diff options
context:
space:
mode:
authorBen Byer <bbyer@bbyer.local>2007-12-02 07:36:51 -0800
committerBen Byer <bbyer@bbyer.local>2007-12-02 07:36:51 -0800
commit9970b5b6f8237685267b7972282319cf266661ea (patch)
treefae48c10ea22a4f03da29f4f687d1d9541da877e /Xtrans.c
parentcd1da5cec49fb7fe6238a00d9ba550b3ed78fa08 (diff)
make launchd error messages less scary
Diffstat (limited to 'Xtrans.c')
-rw-r--r--Xtrans.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/Xtrans.c b/Xtrans.c
index 2bdbd06..8ec2112 100644
--- a/Xtrans.c
+++ b/Xtrans.c
@@ -1091,29 +1091,31 @@ TRANS(MakeAllCOTSServerListeners) (char *port, int *partial, int *count_ret,
}
if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
- fprintf(stderr,"Check-in failed: %s\n",strerror(launch_data_get_errno(checkin_response)));
+ // ignore EACCES, which is common if we weren't started by launchd
+ if (launch_data_get_errno(checkin_response) != EACCES)
+ fprintf(stderr,"launchd check-in failed: %s\n",strerror(launch_data_get_errno(checkin_response)));
goto not_launchd;
}
sockets_dict = launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
if (NULL == sockets_dict) {
- fprintf(stderr,"No sockets found to answer requests on!\n");
+ fprintf(stderr,"launchd check-in: no sockets found to answer requests on!\n");
goto not_launchd;
}
if (launch_data_dict_get_count(sockets_dict) > 1) {
- fprintf(stderr,"Some sockets will be ignored!\n");
+ fprintf(stderr,"launchd check-in: some sockets will be ignored!\n");
goto not_launchd;
}
listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
if (NULL == listening_fd_array) {
- fprintf(stderr,"No known sockets found to answer requests on!\n");
+ fprintf(stderr,"launchd check-in: No known sockets found to answer requests on!\n");
goto not_launchd;
}
if (launch_data_array_get_count(listening_fd_array)!=1) {
- fprintf(stderr,"Expected 1 socket from launchd, got %d)\n",
+ fprintf(stderr,"launchd check-in: Expected 1 socket from launchd, got %d)\n",
launch_data_array_get_count(listening_fd_array));
goto not_launchd;
}