5324557c7b
indent butchered Objective-C formatting. This patch was created by: 1) Reverting the indent changes in hw/xquartz 2) Editing X11Application.m and chaning some #ifdef logic to work with uncrustify 3) Hand edited some (c) notifications 4) Opened all XQuartz sources in XCode and re-indented (^I) 5) Ran uncrustify with this configuration (as close to the indent rules as I could get): tok_split_gte=false utf8_byte=true utf8_force=true indent_cmt_with_tabs=false indent_align_string=false indent_braces=false indent_braces_no_func=false indent_braces_no_class=false indent_braces_no_struct=false indent_brace_parent=false indent_namespace=false indent_extern=false indent_class=false indent_class_colon=false indent_else_if=false indent_var_def_cont=false indent_func_call_param=false indent_func_def_param=false indent_func_proto_param=false indent_func_class_param=false indent_func_ctor_var_param=false indent_template_param=false indent_func_param_double=false indent_relative_single_line_comments=false indent_col1_comment=false indent_access_spec_body=false indent_paren_nl=false indent_comma_paren=false indent_bool_paren=false indent_first_bool_expr=false indent_square_nl=false indent_preserve_sql=false indent_align_assign=true sp_balance_nested_parens=false align_keep_tabs=false align_with_tabs=false align_on_tabstop=false align_number_left=false align_func_params=false align_same_func_call_params=false align_var_def_colon=true align_var_def_attribute=true align_var_def_inline=true align_right_cmt_mix=false align_on_operator=false align_mix_var_proto=false align_single_line_func=false align_single_line_brace=false align_nl_cont=false align_left_shift=true align_oc_decl_colon=true nl_collapse_empty_body=true nl_assign_leave_one_liners=true nl_class_leave_one_liners=true nl_enum_leave_one_liners=true nl_getset_leave_one_liners=true nl_func_leave_one_liners=true nl_if_leave_one_liners=true nl_multi_line_cond=false nl_multi_line_define=false nl_before_case=true nl_after_case=true nl_after_return=false nl_after_semicolon=true nl_after_brace_open=true nl_after_brace_open_cmt=false nl_after_vbrace_open=false nl_after_vbrace_open_empty=false nl_after_brace_close=false nl_after_vbrace_close=false nl_define_macro=false nl_squeeze_ifdef=false nl_ds_struct_enum_cmt=false nl_ds_struct_enum_close_brace=false nl_create_if_one_liner=false nl_create_for_one_liner=false nl_create_while_one_liner=false ls_for_split_full=false ls_func_split_full=false nl_after_multiline_comment=false eat_blanks_after_open_brace=false eat_blanks_before_close_brace=false mod_full_brace_if_chain=false mod_pawn_semicolon=false mod_full_paren_if_bool=false mod_remove_extra_semicolon=false mod_sort_import=false mod_sort_using=false mod_sort_include=false mod_move_case_break=false mod_remove_empty_return=false cmt_indent_multi=true cmt_c_group=false cmt_c_nl_start=false cmt_c_nl_end=false cmt_cpp_group=false cmt_cpp_nl_start=false cmt_cpp_nl_end=false cmt_cpp_to_c=false cmt_star_cont=false cmt_multi_check_last=true cmt_insert_before_preproc=false pp_indent_at_level=false pp_region_indent_code=false pp_if_indent_code=false pp_define_at_level=false indent_columns=4 indent_brace=0 indent_switch_case=0 align_struct_init_span=2 align_pp_define_gap=0 align_pp_define_span=2 align_oc_msg_colon_span=16 nl_end_of_file_min=1 nl_func_var_def_blk=0 code_width=78 nl_max=2 newlines=auto indent_with_tabs=0 sp_arith=force sp_assign=force sp_assign_default=force sp_before_assign=force sp_after_assign=force sp_enum_assign=force sp_enum_before_assign=force sp_enum_after_assign=force sp_pp_stringify=add sp_bool=force sp_compare=force sp_inside_paren=remove sp_paren_paren=remove sp_paren_brace=force sp_before_ptr_star=ignore sp_before_unnamed_ptr_star=force sp_before_byref=force sp_before_unnamed_byref=force sp_after_byref=remove sp_after_type=force sp_before_sparen=force sp_inside_sparen=remove sp_inside_sparen_close=remove sp_after_sparen=force sp_sparen_brace=force sp_special_semi=force sp_before_semi=remove sp_after_semi=force sp_after_semi_for=force sp_after_semi_for_empty=remove sp_before_square=remove sp_inside_square=remove sp_after_comma=force sp_before_comma=remove sp_paren_comma=force sp_before_ellipsis=force sp_after_class_colon=force sp_before_class_colon=force sp_before_case_colon=remove sp_after_cast=remove sp_inside_paren_cast=remove sp_sizeof_paren=remove sp_inside_braces_enum=force sp_inside_braces_struct=force sp_inside_braces=force sp_inside_braces_empty=remove sp_func_proto_paren=remove sp_func_def_paren=remove sp_inside_fparens=remove sp_inside_fparen=remove sp_square_fparen=remove sp_fparen_brace=force sp_func_call_paren=remove sp_func_call_paren_empty=remove sp_return_paren=force sp_attribute_paren=remove sp_defined_paren=remove sp_macro=force sp_macro_func=force sp_else_brace=force sp_brace_else=force sp_brace_typedef=force sp_not=remove sp_inv=remove nl_start_of_file=remove nl_end_of_file=force nl_assign_square=remove nl_after_square_assign=remove nl_fcall_brace=remove nl_enum_brace=remove nl_struct_brace=remove nl_union_brace=remove nl_if_brace=remove nl_brace_else=force nl_elseif_brace=remove nl_else_brace=remove nl_else_if=remove nl_for_brace=remove nl_do_brace=remove nl_brace_while=remove nl_switch_brace=remove nl_case_colon_brace=force nl_func_type_name=force nl_func_type_name_class=force nl_func_proto_type_name=force nl_func_paren=remove nl_func_def_paren=remove nl_func_decl_start=remove nl_func_def_start=remove nl_func_decl_args=remove nl_func_decl_end=remove nl_func_def_end=remove nl_func_decl_end_single=remove nl_func_def_end_single=remove nl_func_decl_empty=remove nl_func_def_empty=remove nl_fdef_brace=force nl_return_expr=remove nl_before_if=ignore nl_after_if=ignore nl_before_for=ignore nl_after_for=ignore nl_before_while=ignore nl_after_while=ignore nl_before_switch=ignore nl_after_switch=ignore nl_before_do=ignore nl_after_do=ignore pp_space=remove Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
381 lines
11 KiB
C
381 lines
11 KiB
C
/* Copyright (c) 2008-2012 Apple Inc.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person
|
|
* obtaining a copy of this software and associated documentation files
|
|
* (the "Software"), to deal in the Software without restriction,
|
|
* including without limitation the rights to use, copy, modify, merge,
|
|
* publish, distribute, sublicense, and/or sell copies of the Software,
|
|
* and to permit persons to whom the Software is furnished to do so,
|
|
* subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be
|
|
* included in all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
|
|
* HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
|
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*
|
|
* Except as contained in this notice, the name(s) of the above
|
|
* copyright holders shall not be used in advertising or otherwise to
|
|
* promote the sale, use or other dealings in this Software without
|
|
* prior written authorization.
|
|
*/
|
|
|
|
#include <CoreServices/CoreServices.h>
|
|
|
|
#ifdef HAVE_DIX_CONFIG_H
|
|
#include <dix-config.h>
|
|
#endif
|
|
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <errno.h>
|
|
#include <asl.h>
|
|
|
|
#include <sys/socket.h>
|
|
#include <sys/un.h>
|
|
|
|
#define kX11AppBundleId BUNDLE_ID_PREFIX ".X11"
|
|
#define kX11AppBundlePath "/Contents/MacOS/X11"
|
|
|
|
#include <mach/mach.h>
|
|
#include <mach/mach_error.h>
|
|
#include <servers/bootstrap.h>
|
|
#include "mach_startup.h"
|
|
|
|
#include <signal.h>
|
|
|
|
#include <AvailabilityMacros.h>
|
|
|
|
#include "launchd_fd.h"
|
|
|
|
static char x11_path[PATH_MAX + 1];
|
|
static pid_t x11app_pid = 0;
|
|
aslclient aslc;
|
|
|
|
static void
|
|
set_x11_path(void)
|
|
{
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
|
|
|
CFURLRef appURL = NULL;
|
|
OSStatus osstatus =
|
|
LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(
|
|
kX11AppBundleId), nil, nil, &appURL);
|
|
|
|
switch (osstatus) {
|
|
case noErr:
|
|
if (appURL == NULL) {
|
|
asl_log(
|
|
aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Invalid response from LSFindApplicationForInfo(%s)",
|
|
kX11AppBundleId);
|
|
exit(1);
|
|
}
|
|
|
|
if (!CFURLGetFileSystemRepresentation(appURL, true,
|
|
(unsigned char *)x11_path,
|
|
sizeof(x11_path))) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Error resolving URL for %s",
|
|
kX11AppBundleId);
|
|
exit(3);
|
|
}
|
|
|
|
strlcat(x11_path, kX11AppBundlePath, sizeof(x11_path));
|
|
asl_log(aslc, NULL, ASL_LEVEL_INFO, "Xquartz: X11.app = %s", x11_path);
|
|
break;
|
|
|
|
case kLSApplicationNotFoundErr:
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Unable to find application for %s",
|
|
kX11AppBundleId);
|
|
exit(10);
|
|
|
|
default:
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Unable to find application for %s, error code = %d",
|
|
kX11AppBundleId,
|
|
(int)osstatus);
|
|
exit(11);
|
|
}
|
|
#else
|
|
/* TODO: Make Tiger smarter... but TBH, this should never get called on Tiger... */
|
|
strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11",
|
|
sizeof(x11_path));
|
|
#endif
|
|
}
|
|
|
|
static int
|
|
connect_to_socket(const char *filename)
|
|
{
|
|
struct sockaddr_un servaddr_un;
|
|
struct sockaddr *servaddr;
|
|
socklen_t servaddr_len;
|
|
int ret_fd;
|
|
|
|
/* Setup servaddr_un */
|
|
memset(&servaddr_un, 0, sizeof(struct sockaddr_un));
|
|
servaddr_un.sun_family = AF_UNIX;
|
|
strlcpy(servaddr_un.sun_path, filename, sizeof(servaddr_un.sun_path));
|
|
|
|
servaddr = (struct sockaddr *)&servaddr_un;
|
|
servaddr_len = sizeof(struct sockaddr_un) -
|
|
sizeof(servaddr_un.sun_path) + strlen(filename);
|
|
|
|
ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
|
|
if (ret_fd == -1) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Failed to create socket: %s - %s", filename,
|
|
strerror(
|
|
errno));
|
|
return -1;
|
|
}
|
|
|
|
if (connect(ret_fd, servaddr, servaddr_len) < 0) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Failed to connect to socket: %s - %d - %s",
|
|
filename, errno,
|
|
strerror(
|
|
errno));
|
|
close(ret_fd);
|
|
return -1;
|
|
}
|
|
|
|
return ret_fd;
|
|
}
|
|
|
|
static void
|
|
send_fd_handoff(int connected_fd, int launchd_fd)
|
|
{
|
|
char databuf[] = "display";
|
|
struct iovec iov[1];
|
|
|
|
union {
|
|
struct cmsghdr hdr;
|
|
char bytes[CMSG_SPACE(sizeof(int))];
|
|
} buf;
|
|
|
|
struct msghdr msg;
|
|
struct cmsghdr *cmsg;
|
|
|
|
iov[0].iov_base = databuf;
|
|
iov[0].iov_len = sizeof(databuf);
|
|
|
|
msg.msg_iov = iov;
|
|
msg.msg_iovlen = 1;
|
|
msg.msg_control = buf.bytes;
|
|
msg.msg_controllen = sizeof(buf);
|
|
msg.msg_name = 0;
|
|
msg.msg_namelen = 0;
|
|
msg.msg_flags = 0;
|
|
|
|
cmsg = CMSG_FIRSTHDR(&msg);
|
|
cmsg->cmsg_level = SOL_SOCKET;
|
|
cmsg->cmsg_type = SCM_RIGHTS;
|
|
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
|
|
|
msg.msg_controllen = cmsg->cmsg_len;
|
|
|
|
*((int *)CMSG_DATA(cmsg)) = launchd_fd;
|
|
|
|
if (sendmsg(connected_fd, &msg, 0) < 0) {
|
|
asl_log(
|
|
aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Error sending $DISPLAY file descriptor over fd %d: %d -- %s",
|
|
connected_fd, errno, strerror(errno));
|
|
return;
|
|
}
|
|
|
|
asl_log(aslc, NULL, ASL_LEVEL_DEBUG,
|
|
"Xquartz: Message sent. Closing handoff fd.");
|
|
close(connected_fd);
|
|
}
|
|
|
|
__attribute__((__noreturn__))
|
|
static void
|
|
signal_handler(int sig)
|
|
{
|
|
if (x11app_pid)
|
|
kill(x11app_pid, sig);
|
|
_exit(0);
|
|
}
|
|
|
|
int
|
|
main(int argc, char **argv, char **envp)
|
|
{
|
|
int envpc;
|
|
kern_return_t kr;
|
|
mach_port_t mp;
|
|
string_array_t newenvp;
|
|
string_array_t newargv;
|
|
size_t i;
|
|
int launchd_fd;
|
|
string_t handoff_socket_filename;
|
|
sig_t handler;
|
|
char *asl_sender;
|
|
char *asl_facility;
|
|
char *server_bootstrap_name = kX11AppBundleId;
|
|
|
|
if (getenv("X11_PREFS_DOMAIN"))
|
|
server_bootstrap_name = getenv("X11_PREFS_DOMAIN");
|
|
|
|
asprintf(&asl_sender, "%s.stub", server_bootstrap_name);
|
|
assert(asl_sender);
|
|
|
|
asl_facility = strdup(server_bootstrap_name);
|
|
assert(asl_facility);
|
|
if (strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
|
|
asl_facility[strlen(asl_facility) - 4] = '\0';
|
|
|
|
assert(aslc = asl_open(asl_sender, asl_facility, ASL_OPT_NO_DELAY));
|
|
free(asl_sender);
|
|
free(asl_facility);
|
|
|
|
/* We don't have a mechanism in place to handle this interrupt driven
|
|
* server-start notification, so just send the signal now, so xinit doesn't
|
|
* time out waiting for it and will just poll for the server.
|
|
*/
|
|
handler = signal(SIGUSR1, SIG_IGN);
|
|
if (handler == SIG_IGN)
|
|
kill(getppid(), SIGUSR1);
|
|
signal(SIGUSR1, handler);
|
|
|
|
/* Pass on SIGs to X11.app */
|
|
signal(SIGINT, signal_handler);
|
|
signal(SIGTERM, signal_handler);
|
|
|
|
/* Get the $DISPLAY FD */
|
|
launchd_fd = launchd_display_fd();
|
|
|
|
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
|
|
if (kr != KERN_SUCCESS) {
|
|
pid_t child;
|
|
|
|
asl_log(aslc, NULL, ASL_LEVEL_WARNING,
|
|
"Xquartz: Unable to locate waiting server: %s",
|
|
server_bootstrap_name);
|
|
set_x11_path();
|
|
|
|
/* This forking is ugly and will be cleaned up later */
|
|
child = fork();
|
|
if (child == -1) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s",
|
|
strerror(
|
|
errno));
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
if (child == 0) {
|
|
char *_argv[3];
|
|
_argv[0] = x11_path;
|
|
_argv[1] = "--listenonly";
|
|
_argv[2] = NULL;
|
|
asl_log(aslc, NULL, ASL_LEVEL_NOTICE,
|
|
"Xquartz: Starting X server: %s --listenonly",
|
|
x11_path);
|
|
return execvp(x11_path, _argv);
|
|
}
|
|
|
|
/* Try connecting for 10 seconds */
|
|
for (i = 0; i < 80; i++) {
|
|
usleep(250000);
|
|
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
|
|
if (kr == KERN_SUCCESS)
|
|
break;
|
|
}
|
|
|
|
if (kr != KERN_SUCCESS) {
|
|
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: bootstrap_look_up(): %s", bootstrap_strerror(
|
|
kr));
|
|
#else
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: bootstrap_look_up(): %ul",
|
|
(unsigned long)kr);
|
|
#endif
|
|
return EXIT_FAILURE;
|
|
}
|
|
}
|
|
|
|
/* Get X11.app's pid */
|
|
request_pid(mp, &x11app_pid);
|
|
|
|
/* Handoff the $DISPLAY FD */
|
|
if (launchd_fd != -1) {
|
|
size_t try, try_max;
|
|
int handoff_fd = -1;
|
|
|
|
for (try = 0, try_max = 5; try < try_max; try++) {
|
|
if (request_fd_handoff_socket(mp,
|
|
handoff_socket_filename) !=
|
|
KERN_SUCCESS) {
|
|
asl_log(
|
|
aslc, NULL, ASL_LEVEL_INFO,
|
|
"Xquartz: Failed to request a socket from the server to send the $DISPLAY fd over (try %d of %d)",
|
|
(int)try + 1, (int)try_max);
|
|
continue;
|
|
}
|
|
|
|
handoff_fd = connect_to_socket(handoff_socket_filename);
|
|
if (handoff_fd == -1) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Failed to connect to socket (try %d of %d)",
|
|
(int)try + 1,
|
|
(int)try_max);
|
|
continue;
|
|
}
|
|
|
|
asl_log(
|
|
aslc, NULL, ASL_LEVEL_INFO,
|
|
"Xquartz: Handoff connection established (try %d of %d) on fd %d, \"%s\". Sending message.",
|
|
(int)try + 1, (int)try_max, handoff_fd,
|
|
handoff_socket_filename);
|
|
send_fd_handoff(handoff_fd, launchd_fd);
|
|
close(handoff_fd);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Count envp */
|
|
for (envpc = 0; envp[envpc]; envpc++) ;
|
|
|
|
/* We have fixed-size string lengths due to limitations in IPC,
|
|
* so we need to copy our argv and envp.
|
|
*/
|
|
newargv = (string_array_t)calloc((1 + argc), sizeof(string_t));
|
|
newenvp = (string_array_t)calloc((1 + envpc), sizeof(string_t));
|
|
|
|
if (!newargv || !newenvp) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR,
|
|
"Xquartz: Memory allocation failure");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
strlcpy(newargv[i], argv[i], STRING_T_SIZE);
|
|
}
|
|
for (i = 0; i < envpc; i++) {
|
|
strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
|
|
}
|
|
|
|
kr = start_x11_server(mp, newargv, argc, newenvp, envpc);
|
|
|
|
free(newargv);
|
|
free(newenvp);
|
|
|
|
if (kr != KERN_SUCCESS) {
|
|
asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s",
|
|
mach_error_string(
|
|
kr));
|
|
return EXIT_FAILURE;
|
|
}
|
|
return EXIT_SUCCESS;
|
|
}
|