summaryrefslogtreecommitdiff
path: root/hw/xquartz/mach-startup
diff options
context:
space:
mode:
Diffstat (limited to 'hw/xquartz/mach-startup')
-rw-r--r--hw/xquartz/mach-startup/bundle-main.c496
-rw-r--r--hw/xquartz/mach-startup/launchd_fd.c56
-rw-r--r--hw/xquartz/mach-startup/launchd_fd.h2
-rw-r--r--hw/xquartz/mach-startup/mach_startup_types.h2
-rw-r--r--hw/xquartz/mach-startup/stub.c210
5 files changed, 454 insertions, 312 deletions
diff --git a/hw/xquartz/mach-startup/bundle-main.c b/hw/xquartz/mach-startup/bundle-main.c
index 94c606823..7a53803da 100644
--- a/hw/xquartz/mach-startup/bundle-main.c
+++ b/hw/xquartz/mach-startup/bundle-main.c
@@ -69,8 +69,13 @@ void DarwinListenOnOpenFD(int fd);
extern aslclient aslc;
/* Ditto, from os/log.c */
-extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2);
-extern void FatalError(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2) _X_NORETURN;
+extern void
+ErrorF(const char *f, ...)
+_X_ATTRIBUTE_PRINTF(1, 2);
+extern void
+FatalError(const char *f, ...)
+_X_ATTRIBUTE_PRINTF(1, 2)
+ _X_NORETURN;
extern int noPanoramiXExtension;
@@ -85,16 +90,19 @@ extern int noPanoramiXExtension;
#define XSERVER_VERSION "?"
#endif
-static char __crashreporter_info_buff__[4096] = {0};
-static const char *__crashreporter_info__ __attribute__((__used__)) = &__crashreporter_info_buff__[0];
+static char __crashreporter_info_buff__[4096] = { 0 };
+
+static const char *__crashreporter_info__ __attribute__ ((__used__)) =
+ &__crashreporter_info_buff__[0];
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
// This is actually a toolchain requirement, but I'm not sure the correct check,
// but it should be fine to just only include it for Leopard and later. This line
// just tells the linker to never strip this symbol (such as for space optimization)
-asm (".desc ___crashreporter_info__, 0x10");
+asm(".desc ___crashreporter_info__, 0x10");
#endif
-static const char *__crashreporter_info__base = "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
+static const char *__crashreporter_info__base =
+ "X.Org X Server " XSERVER_VERSION " Build Date: " BUILD_DATE;
char *bundle_id_prefix = NULL;
static char *server_bootstrap_name = NULL;
@@ -113,16 +121,18 @@ static char *pref_startx_script;
#ifndef HAVE_LIBDISPATCH
/*** Pthread Magics ***/
-static pthread_t create_thread(void *(*func)(void *), void *arg) {
+static pthread_t
+create_thread(void *(*func) (void *), void *arg)
+{
pthread_attr_t attr;
pthread_t tid;
-
- pthread_attr_init (&attr);
- pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
- pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
- pthread_create (&tid, &attr, func, arg);
- pthread_attr_destroy (&attr);
-
+
+ pthread_attr_init(&attr);
+ pthread_attr_setscope(&attr, PTHREAD_SCOPE_SYSTEM);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ pthread_create(&tid, &attr, func, arg);
+ pthread_attr_destroy(&attr);
+
return tid;
}
#endif
@@ -130,11 +140,13 @@ static pthread_t create_thread(void *(*func)(void *), void *arg) {
/*** Mach-O IPC Stuffs ***/
union MaxMsgSize {
- union __RequestUnion__mach_startup_subsystem req;
- union __ReplyUnion__mach_startup_subsystem rep;
+ union __RequestUnion__mach_startup_subsystem req;
+ union __ReplyUnion__mach_startup_subsystem rep;
};
-static mach_port_t checkin_or_register(char *bname) {
+static mach_port_t
+checkin_or_register(char *bname)
+{
kern_return_t kr;
mach_port_t mp;
@@ -150,7 +162,8 @@ static mach_port_t checkin_or_register(char *bname) {
exit(EXIT_FAILURE);
}
- kr = mach_port_insert_right(mach_task_self(), mp, mp, MACH_MSG_TYPE_MAKE_SEND);
+ kr = mach_port_insert_right(mach_task_self(), mp, mp,
+ MACH_MSG_TYPE_MAKE_SEND);
if (kr != KERN_SUCCESS) {
ErrorF("mach_port_insert_right(): %s\n", mach_error_string(kr));
exit(EXIT_FAILURE);
@@ -158,7 +171,7 @@ static mach_port_t checkin_or_register(char *bname) {
#ifdef __clang__
#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register
+#pragma clang diagnostic ignored "-Wdeprecated-declarations" // bootstrap_register
#endif
kr = bootstrap_register(bootstrap_port, bname, mp);
#ifdef __clang__
@@ -174,23 +187,25 @@ static mach_port_t checkin_or_register(char *bname) {
}
/*** $DISPLAY handoff ***/
-static int accept_fd_handoff(int connected_fd) {
+static int
+accept_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);
-
+ iov[0].iov_len = sizeof(databuf);
+
msg.msg_iov = iov;
msg.msg_iovlen = 1;
msg.msg_control = buf.bytes;
@@ -198,23 +213,25 @@ static int accept_fd_handoff(int connected_fd) {
msg.msg_name = 0;
msg.msg_namelen = 0;
msg.msg_flags = 0;
-
- cmsg = CMSG_FIRSTHDR (&msg);
+
+ 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)) = -1;
-
- if(recvmsg(connected_fd, &msg, 0) < 0) {
- ErrorF("X11.app: Error receiving $DISPLAY file descriptor. recvmsg() error: %s\n", strerror(errno));
+
+ *((int *) CMSG_DATA(cmsg)) = -1;
+
+ if (recvmsg(connected_fd, &msg, 0) < 0) {
+ ErrorF
+ ("X11.app: Error receiving $DISPLAY file descriptor. recvmsg() error: %s\n",
+ strerror(errno));
return -1;
}
-
- launchd_fd = *((int*)CMSG_DATA(cmsg));
-
+
+ launchd_fd = *((int *) CMSG_DATA(cmsg));
+
return launchd_fd;
}
@@ -227,10 +244,14 @@ typedef struct {
* descriptor for the new connection to accept_fd_handoff()
*/
#ifdef HAVE_LIBDISPATCH
-static void socket_handoff(socket_handoff_t *handoff_data) {
+static void
+socket_handoff(socket_handoff_t * handoff_data)
+{
#else
-static void *socket_handoff_thread(void *arg) {
- socket_handoff_t *handoff_data = (socket_handoff_t *)arg;
+static void *
+socket_handoff_thread(void *arg)
+{
+ socket_handoff_t *handoff_data = (socket_handoff_t *) arg;
#endif
int launchd_fd = -1;
@@ -239,17 +260,20 @@ static void *socket_handoff_thread(void *arg) {
/* Now actually get the passed file descriptor from this connection
* If we encounter an error, keep listening.
*/
- while(launchd_fd == -1) {
+ while (launchd_fd == -1) {
connected_fd = accept(handoff_data->fd, NULL, NULL);
- if(connected_fd == -1) {
- ErrorF("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n", handoff_data->fd, strerror(errno));
+ if (connected_fd == -1) {
+ ErrorF
+ ("X11.app: Failed to accept incoming connection on socket (fd=%d): %s\n",
+ handoff_data->fd, strerror(errno));
sleep(2);
continue;
}
launchd_fd = accept_fd_handoff(connected_fd);
- if(launchd_fd == -1)
- ErrorF("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received? Waiting for another connection.\n");
+ if (launchd_fd == -1)
+ ErrorF
+ ("X11.app: Error receiving $DISPLAY file descriptor, no descriptor received? Waiting for another connection.\n");
close(connected_fd);
}
@@ -257,8 +281,10 @@ static void *socket_handoff_thread(void *arg) {
close(handoff_data->fd);
unlink(handoff_data->filename);
free(handoff_data);
-
- ErrorF("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n", launchd_fd);
+
+ ErrorF
+ ("X11.app Handing off fd to server thread via DarwinListenOnOpenFD(%d)\n",
+ launchd_fd);
DarwinListenOnOpenFD(launchd_fd);
#ifndef HAVE_LIBDISPATCH
@@ -266,67 +292,78 @@ static void *socket_handoff_thread(void *arg) {
#endif
}
-static int create_socket(char *filename_out) {
+static int
+create_socket(char *filename_out)
+{
struct sockaddr_un servaddr_un;
struct sockaddr *servaddr;
socklen_t servaddr_len;
int ret_fd;
size_t try, try_max;
-
- for(try=0, try_max=5; try < try_max; try++) {
+
+ for (try = 0, try_max = 5; try < try_max; try++) {
tmpnam(filename_out);
-
+
/* Setup servaddr_un */
- memset (&servaddr_un, 0, sizeof (struct sockaddr_un));
+ memset(&servaddr_un, 0, sizeof(struct sockaddr_un));
servaddr_un.sun_family = AF_UNIX;
- strlcpy(servaddr_un.sun_path, filename_out, sizeof(servaddr_un.sun_path));
-
+ strlcpy(servaddr_un.sun_path, filename_out,
+ sizeof(servaddr_un.sun_path));
+
servaddr = (struct sockaddr *) &servaddr_un;
- servaddr_len = sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) + strlen(filename_out);
-
+ servaddr_len =
+ sizeof(struct sockaddr_un) - sizeof(servaddr_un.sun_path) +
+ strlen(filename_out);
+
ret_fd = socket(PF_UNIX, SOCK_STREAM, 0);
- if(ret_fd == -1) {
- ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n", (int)try+1, (int)try_max, filename_out, strerror(errno));
+ if (ret_fd == -1) {
+ ErrorF("X11.app: Failed to create socket (try %d / %d): %s - %s\n",
+ (int) try + 1, (int) try_max, filename_out, strerror(errno));
continue;
}
-
- if(bind(ret_fd, servaddr, servaddr_len) != 0) {
- ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno, strerror(errno));
+
+ if (bind(ret_fd, servaddr, servaddr_len) != 0) {
+ ErrorF("X11.app: Failed to bind socket: %d - %s\n", errno,
+ strerror(errno));
close(ret_fd);
return 0;
}
-
- if(listen(ret_fd, 10) != 0) {
- ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n", filename_out, errno, strerror(errno));
+
+ if (listen(ret_fd, 10) != 0) {
+ ErrorF("X11.app: Failed to listen to socket: %s - %d - %s\n",
+ filename_out, errno, strerror(errno));
close(ret_fd);
return 0;
}
-
+
#ifdef DEBUG
- ErrorF("X11.app: Listening on socket for fd handoff: (%d) %s\n", ret_fd, filename_out);
+ ErrorF("X11.app: Listening on socket for fd handoff: (%d) %s\n",
+ ret_fd, filename_out);
#endif
-
+
return ret_fd;
}
-
+
return 0;
}
static int launchd_socket_handed_off = 0;
-kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename) {
+kern_return_t
+do_request_fd_handoff_socket(mach_port_t port, string_t filename)
+{
socket_handoff_t *handoff_data;
-
+
launchd_socket_handed_off = 1;
- handoff_data = (socket_handoff_t *)calloc(1,sizeof(socket_handoff_t));
- if(!handoff_data) {
+ handoff_data = (socket_handoff_t *) calloc(1, sizeof(socket_handoff_t));
+ if (!handoff_data) {
ErrorF("X11.app: Error allocating memory for handoff_data\n");
return KERN_FAILURE;
}
handoff_data->fd = create_socket(handoff_data->filename);
- if(!handoff_data->fd) {
+ if (!handoff_data->fd) {
free(handoff_data);
return KERN_FAILURE;
}
@@ -334,71 +371,78 @@ kern_return_t do_request_fd_handoff_socket(mach_port_t port, string_t filename)
strlcpy(filename, handoff_data->filename, STRING_T_SIZE);
#ifdef HAVE_LIBDISPATCH
- dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT,0), ^{
- socket_handoff(handoff_data);
- });
+ dispatch_async(dispatch_get_global_queue
+ (DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^ {
+ socket_handoff(handoff_data);}
+ );
#else
create_thread(socket_handoff_thread, handoff_data);
#endif
-
+
#ifdef DEBUG
- ErrorF("X11.app: Thread created for handoff. Returning success to tell caller to connect and push the fd.\n");
+ ErrorF
+ ("X11.app: Thread created for handoff. Returning success to tell caller to connect and push the fd.\n");
#endif
return KERN_SUCCESS;
}
-kern_return_t do_request_pid(mach_port_t port, int *my_pid) {
+kern_return_t
+do_request_pid(mach_port_t port, int *my_pid)
+{
*my_pid = getpid();
return KERN_SUCCESS;
}
/*** Server Startup ***/
-kern_return_t do_start_x11_server(mach_port_t port, string_array_t argv,
- mach_msg_type_number_t argvCnt,
- string_array_t envp,
- mach_msg_type_number_t envpCnt) {
+kern_return_t
+do_start_x11_server(mach_port_t port, string_array_t argv,
+ mach_msg_type_number_t argvCnt,
+ string_array_t envp, mach_msg_type_number_t envpCnt)
+{
/* And now back to char ** */
char **_argv = alloca((argvCnt + 1) * sizeof(char *));
char **_envp = alloca((envpCnt + 1) * sizeof(char *));
size_t i;
-
+
/* If we didn't get handed a launchd DISPLAY socket, we should
* unset DISPLAY or we can run into problems with pbproxy
*/
- if(!launchd_socket_handed_off) {
+ if (!launchd_socket_handed_off) {
ErrorF("X11.app: No launchd socket handed off, unsetting DISPLAY\n");
unsetenv("DISPLAY");
}
-
- if(!_argv || !_envp) {
+
+ if (!_argv || !_envp) {
return KERN_FAILURE;
}
ErrorF("X11.app: do_start_x11_server(): argc=%d\n", argvCnt);
- for(i=0; i < argvCnt; i++) {
+ for (i = 0; i < argvCnt; i++) {
_argv[i] = argv[i];
- ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
+ ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
}
_argv[argvCnt] = NULL;
-
- for(i=0; i < envpCnt; i++) {
+
+ for (i = 0; i < envpCnt; i++) {
_envp[i] = envp[i];
}
_envp[envpCnt] = NULL;
-
- if(server_main(argvCnt, _argv, _envp) == 0)
+
+ if (server_main(argvCnt, _argv, _envp) == 0)
return KERN_SUCCESS;
else
return KERN_FAILURE;
}
-static int startup_trigger(int argc, char **argv, char **envp) {
+static int
+startup_trigger(int argc, char **argv, char **envp)
+{
Display *display;
const char *s;
-
+
/* Take care of the case where we're called like a normal DDX */
- if(argc > 1 && argv[1][0] == ':') {
+ if (argc > 1 && argv[1][0] == ':') {
size_t i;
kern_return_t kr;
mach_port_t mp;
@@ -407,32 +451,35 @@ static int startup_trigger(int argc, char **argv, char **envp) {
/* We need to count envp */
int envpc;
- for(envpc=0; envp[envpc]; envpc++);
+
+ 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)alloca(argc * sizeof(string_t));
- newenvp = (string_array_t)alloca(envpc * sizeof(string_t));
-
- if(!newargv || !newenvp) {
+ newargv = (string_array_t) alloca(argc * sizeof(string_t));
+ newenvp = (string_array_t) alloca(envpc * sizeof(string_t));
+
+ if (!newargv || !newenvp) {
ErrorF("Memory allocation failure\n");
exit(EXIT_FAILURE);
}
-
- for(i=0; i < argc; i++) {
+
+ for (i = 0; i < argc; i++) {
strlcpy(newargv[i], argv[i], STRING_T_SIZE);
}
- for(i=0; i < envpc; i++) {
+ for (i = 0; i < envpc; i++) {
strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
}
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
if (kr != KERN_SUCCESS) {
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name, bootstrap_strerror(kr));
+ ErrorF("bootstrap_look_up(%s): %s\n", server_bootstrap_name,
+ bootstrap_strerror(kr));
#else
- ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name, (unsigned long)kr);
+ ErrorF("bootstrap_look_up(%s): %ul\n", server_bootstrap_name,
+ (unsigned long) kr);
#endif
exit(EXIT_FAILURE);
}
@@ -448,10 +495,10 @@ static int startup_trigger(int argc, char **argv, char **envp) {
/* If we have a process serial number and it's our only arg, act as if
* the user double clicked the app bundle: launch app_to_run if possible
*/
- if(argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
+ if (argc == 1 || (argc == 2 && !strncmp(argv[1], "-psn_", 5))) {
/* Now, try to open a display, if so, run the launcher */
display = XOpenDisplay(NULL);
- if(display) {
+ if (display) {
/* Could open the display, start the launcher */
XCloseDisplay(display);
@@ -460,31 +507,41 @@ static int startup_trigger(int argc, char **argv, char **envp) {
}
/* Start the server */
- if((s = getenv("DISPLAY"))) {
- ErrorF("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n", s);
+ if ((s = getenv("DISPLAY"))) {
+ ErrorF
+ ("X11.app: Could not connect to server (DISPLAY=\"%s\", unsetting). Starting X server.\n",
+ s);
unsetenv("DISPLAY");
- } else {
- ErrorF("X11.app: Could not connect to server (DISPLAY is not set). Starting X server.\n");
+ }
+ else {
+ ErrorF
+ ("X11.app: Could not connect to server (DISPLAY is not set). Starting X server.\n");
}
return execute(pref_startx_script);
}
/** Setup the environment we want our child processes to inherit */
-static void ensure_path(const char *dir) {
+static void
+ensure_path(const char *dir)
+{
char buf[1024], *temp;
-
+
/* Make sure /usr/X11/bin is in the $PATH */
temp = getenv("PATH");
- if(temp == NULL || temp[0] == 0) {
- snprintf(buf, sizeof(buf), "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
+ if (temp == NULL || temp[0] == 0) {
+ snprintf(buf, sizeof(buf),
+ "/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:%s", dir);
setenv("PATH", buf, TRUE);
- } else if(strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
+ }
+ else if (strnstr(temp, X11BINDIR, sizeof(temp)) == NULL) {
snprintf(buf, sizeof(buf), "%s:%s", temp, dir);
setenv("PATH", buf, TRUE);
}
}
-static void setup_console_redirect(const char *bundle_id) {
+static void
+setup_console_redirect(const char *bundle_id)
+{
char *asl_sender;
char *asl_facility;
@@ -493,7 +550,7 @@ static void setup_console_redirect(const char *bundle_id) {
asl_facility = strdup(bundle_id);
assert(asl_facility);
- if(strcmp(asl_facility + strlen(asl_facility) - 4, ".X11") == 0)
+ 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));
@@ -505,7 +562,9 @@ static void setup_console_redirect(const char *bundle_id) {
xq_asl_capture_fd(aslc, NULL, ASL_LEVEL_NOTICE, STDERR_FILENO);
}
-static void setup_env(void) {
+static void
+setup_env(void)
+{
char *temp;
const char *pds = NULL;
const char *disp = getenv("DISPLAY");
@@ -515,81 +574,93 @@ static void setup_env(void) {
* quartz-wm and the Xquartz stub's MachIPC)
*/
CFBundleRef bundle = CFBundleGetMainBundle();
- if(bundle) {
+
+ if (bundle) {
CFStringRef pd = CFBundleGetIdentifier(bundle);
- if(pd) {
+
+ if (pd) {
pds = CFStringGetCStringPtr(pd, 0);
}
}
/* fallback to hardcoded value if we can't discover it */
- if(!pds) {
- pds = BUNDLE_ID_PREFIX".X11";
+ if (!pds) {
+ pds = BUNDLE_ID_PREFIX ".X11";
}
setup_console_redirect(pds);
server_bootstrap_name = strdup(pds);
- if(!server_bootstrap_name) {
+ if (!server_bootstrap_name) {
ErrorF("X11.app: Memory allocation error.\n");
exit(1);
}
setenv("X11_PREFS_DOMAIN", server_bootstrap_name, 1);
-
+
len = strlen(server_bootstrap_name);
bundle_id_prefix = malloc(sizeof(char) * (len - 3));
- if(!bundle_id_prefix) {
+ if (!bundle_id_prefix) {
ErrorF("X11.app: Memory allocation error.\n");
exit(1);
}
strlcpy(bundle_id_prefix, server_bootstrap_name, len - 3);
-
+
/* We need to unset DISPLAY if it is not our socket */
- if(disp) {
+ if (disp) {
/* s = basename(disp) */
const char *d, *s;
- for(s = NULL, d = disp; *d; d++) {
- if(*d == '/')
+
+ for (s = NULL, d = disp; *d; d++) {
+ if (*d == '/')
s = d + 1;
}
- if(s && *s) {
- if(strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
- ErrorF("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
- } else {
- temp = (char *)malloc(sizeof(char) * len);
- if(!temp) {
- ErrorF("X11.app: Memory allocation error creating space for socket name test.\n");
+ if (s && *s) {
+ if (strcmp(bundle_id_prefix, "org.x") == 0 && strcmp(s, ":0") == 0) {
+ ErrorF
+ ("X11.app: Detected old style launchd DISPLAY, please update xinit.\n");
+ }
+ else {
+ temp = (char *) malloc(sizeof(char) * len);
+ if (!temp) {
+ ErrorF
+ ("X11.app: Memory allocation error creating space for socket name test.\n");
exit(1);
}
strlcpy(temp, bundle_id_prefix, len);
strlcat(temp, ":0", len);
-
- if(strcmp(temp, s) != 0) {
+
+ if (strcmp(temp, s) != 0) {
/* If we don't have a match, unset it. */
- ErrorF("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n", disp, bundle_id_prefix);
+ ErrorF
+ ("X11.app: DISPLAY (\"%s\") does not match our id (\"%s\"), unsetting.\n",
+ disp, bundle_id_prefix);
unsetenv("DISPLAY");
}
free(temp);
}
- } else {
+ }
+ else {
/* The DISPLAY environment variable is not formatted like a launchd socket, so reset. */
- ErrorF("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
+ ErrorF
+ ("X11.app: DISPLAY does not look like a launchd set variable, unsetting.\n");
unsetenv("DISPLAY");
}
}
/* Make sure PATH is right */
ensure_path(X11BINDIR);
-
+
/* cd $HOME */
temp = getenv("HOME");
- if(temp != NULL && temp[0] != '\0')
+ if (temp != NULL && temp[0] != '\0')
chdir(temp);
}
/*** Main ***/
-int main(int argc, char **argv, char **envp) {
+int
+main(int argc, char **argv, char **envp)
+{
Bool listenOnly = FALSE;
int i;
mach_msg_size_t mxmsgsz = sizeof(union MaxMsgSize) + MAX_TRAILER_SIZE;
@@ -598,31 +669,32 @@ int main(int argc, char **argv, char **envp) {
/* Setup our environment for our children */
setup_env();
-
+
/* The server must not run the PanoramiX operations. */
noPanoramiXExtension = TRUE;
/* Setup the initial crasherporter info */
- strlcpy(__crashreporter_info_buff__, __crashreporter_info__base, sizeof(__crashreporter_info_buff__));
-
+ strlcpy(__crashreporter_info_buff__, __crashreporter_info__base,
+ sizeof(__crashreporter_info_buff__));
+
ErrorF("X11.app: main(): argc=%d\n", argc);
- for(i=0; i < argc; i++) {
- ErrorF("\targv[%u] = %s\n", (unsigned)i, argv[i]);
- if(!strcmp(argv[i], "--listenonly")) {
+ for (i = 0; i < argc; i++) {
+ ErrorF("\targv[%u] = %s\n", (unsigned) i, argv[i]);
+ if (!strcmp(argv[i], "--listenonly")) {
listenOnly = TRUE;
}
}
mp = checkin_or_register(server_bootstrap_name);
- if(mp == MACH_PORT_NULL) {
+ if (mp == MACH_PORT_NULL) {
ErrorF("NULL mach service: %s", server_bootstrap_name);
return EXIT_FAILURE;
}
-
+
/* Check if we need to do something other than listen, and make another
* thread handle it.
*/
- if(!listenOnly) {
+ if (!listenOnly) {
pid_t child1, child2;
int status;
@@ -632,50 +704,51 @@ int main(int argc, char **argv, char **envp) {
pref_login_shell = command_from_prefs("login_shell", DEFAULT_SHELL);
assert(pref_login_shell);
- pref_startx_script = command_from_prefs("startx_script", DEFAULT_STARTX);
+ pref_startx_script =
+ command_from_prefs("startx_script", DEFAULT_STARTX);
assert(pref_startx_script);
/* Do the fork-twice trick to avoid having to reap zombies */
child1 = fork();
switch (child1) {
- case -1: /* error */
- FatalError("fork() failed: %s\n", strerror(errno));
+ case -1: /* error */
+ FatalError("fork() failed: %s\n", strerror(errno));
- case 0: /* child1 */
- child2 = fork();
+ case 0: /* child1 */
+ child2 = fork();
- switch (child2) {
- int max_files;
+ switch (child2) {
+ int max_files;
- case -1: /* error */
- FatalError("fork() failed: %s\n", strerror(errno));
+ case -1: /* error */
+ FatalError("fork() failed: %s\n", strerror(errno));
- case 0: /* child2 */
- /* close all open files except for standard streams */
- max_files = sysconf(_SC_OPEN_MAX);
- for(i = 3; i < max_files; i++)
- close(i);
+ case 0: /* child2 */
+ /* close all open files except for standard streams */
+ max_files = sysconf(_SC_OPEN_MAX);
+ for (i = 3; i < max_files; i++)
+ close(i);
- /* ensure stdin is on /dev/null */
- close(0);
- open("/dev/null", O_RDONLY);
+ /* ensure stdin is on /dev/null */
+ close(0);
+ open("/dev/null", O_RDONLY);
- return startup_trigger(argc, argv, envp);
+ return startup_trigger(argc, argv, envp);
- default: /* parent (child1) */
- _exit(0);
- }
- break;
+ default: /* parent (child1) */
+ _exit(0);
+ }
+ break;
- default: /* parent */
- waitpid(child1, &status, 0);
+ default: /* parent */
+ waitpid(child1, &status, 0);
}
free(pref_app_to_run);
free(pref_login_shell);
free(pref_startx_script);
}
-
+
/* Main event loop */
ErrorF("Waiting for startup parameters via Mach IPC.\n");
kr = mach_msg_server(mach_startup_server, mxmsgsz, mp, 0);
@@ -683,72 +756,83 @@ int main(int argc, char **argv, char **envp) {
ErrorF("%s.X11(mp): %s\n", BUNDLE_ID_PREFIX, mach_error_string(kr));
return EXIT_FAILURE;
}
-
+
return EXIT_SUCCESS;
}
-static int execute(const char *command) {
+static int
+execute(const char *command)
+{
const char *newargv[4];
const char **p;
-
+
newargv[0] = pref_login_shell;
newargv[1] = "-c";
newargv[2] = command;
newargv[3] = NULL;
-
+
ErrorF("X11.app: Launching %s:\n", command);
- for(p=newargv; *p; p++) {
- ErrorF("\targv[%ld] = %s\n", (long int)(p - newargv), *p);
+ for (p = newargv; *p; p++) {
+ ErrorF("\targv[%ld] = %s\n", (long int) (p - newargv), *p);
}
- execvp (newargv[0], (char * const *) newargv);
- perror ("X11.app: Couldn't exec.");
+ execvp(newargv[0], (char *const *) newargv);
+ perror("X11.app: Couldn't exec.");
return 1;
}
-static char *command_from_prefs(const char *key, const char *default_value) {
+static char *
+command_from_prefs(const char *key, const char *default_value)
+{
char *command = NULL;
-
+
CFStringRef cfKey;
CFPropertyListRef PlistRef;
- if(!key)
+ if (!key)
return NULL;
cfKey = CFStringCreateWithCString(NULL, key, kCFStringEncodingASCII);
- if(!cfKey)
+ if (!cfKey)
return NULL;
- PlistRef = CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
-
+ PlistRef =
+ CFPreferencesCopyAppValue(cfKey, kCFPreferencesCurrentApplication);
+
if ((PlistRef == NULL) || (CFGetTypeID(PlistRef) != CFStringGetTypeID())) {
- CFStringRef cfDefaultValue = CFStringCreateWithCString(NULL, default_value, kCFStringEncodingASCII);
+ CFStringRef cfDefaultValue =
+ CFStringCreateWithCString(NULL, default_value,
+ kCFStringEncodingASCII);
int len = strlen(default_value) + 1;
- if(!cfDefaultValue)
+ if (!cfDefaultValue)
goto command_from_prefs_out;
- CFPreferencesSetAppValue(cfKey, cfDefaultValue, kCFPreferencesCurrentApplication);
+ CFPreferencesSetAppValue(cfKey, cfDefaultValue,
+ kCFPreferencesCurrentApplication);
CFPreferencesAppSynchronize(kCFPreferencesCurrentApplication);
CFRelease(cfDefaultValue);
-
- command = (char *)malloc(len * sizeof(char));
- if(!command)
+
+ command = (char *) malloc(len * sizeof(char));
+ if (!command)
goto command_from_prefs_out;
strcpy(command, default_value);
- } else {
- int len = CFStringGetLength((CFStringRef)PlistRef) + 1;
- command = (char *)malloc(len * sizeof(char));
- if(!command)
+ }
+ else {
+ int len = CFStringGetLength((CFStringRef) PlistRef) + 1;
+
+ command = (char *) malloc(len * sizeof(char));
+ if (!command)
goto command_from_prefs_out;
- CFStringGetCString((CFStringRef)PlistRef, command, len, kCFStringEncodingASCII);
+ CFStringGetCString((CFStringRef) PlistRef, command, len,
+ kCFStringEncodingASCII);
}
-command_from_prefs_out:
+ command_from_prefs_out:
if (PlistRef)
CFRelease(PlistRef);
- if(cfKey)
+ if (cfKey)
CFRelease(cfKey);
return command;
}
diff --git a/hw/xquartz/mach-startup/launchd_fd.c b/hw/xquartz/mach-startup/launchd_fd.c
index 8003dd177..fd1d276e3 100644
--- a/hw/xquartz/mach-startup/launchd_fd.c
+++ b/hw/xquartz/mach-startup/launchd_fd.c
@@ -38,54 +38,68 @@
extern aslclient aslc;
-int launchd_display_fd(void) {
+int
+launchd_display_fd(void)
+{
launch_data_t sockets_dict, checkin_request, checkin_response;
launch_data_t listening_fd_array, listening_fd;
/* Get launchd fd */
if ((checkin_request = launch_data_new_string(LAUNCH_KEY_CHECKIN)) == NULL) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN "\") Unable to create string.\n");
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "launch_data_new_string(\"" LAUNCH_KEY_CHECKIN
+ "\") Unable to create string.\n");
return ERROR_FD;
}
-
+
if ((checkin_response = launch_msg(checkin_request)) == NULL) {
- asl_log(aslc, NULL, ASL_LEVEL_WARNING, "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",strerror(errno));
+ asl_log(aslc, NULL, ASL_LEVEL_WARNING,
+ "launch_msg(\"" LAUNCH_KEY_CHECKIN "\") IPC failure: %s\n",
+ strerror(errno));
return ERROR_FD;
}
-
+
if (LAUNCH_DATA_ERRNO == launch_data_get_type(checkin_response)) {
// ignore EACCES, which is common if we weren't started by launchd
if (launch_data_get_errno(checkin_response) != EACCES)
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n", strerror(launch_data_get_errno(checkin_response)));
+ asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in failed: %s\n",
+ strerror(launch_data_get_errno(checkin_response)));
return ERROR_FD;
- }
-
- sockets_dict = launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
+ }
+
+ sockets_dict =
+ launch_data_dict_lookup(checkin_response, LAUNCH_JOBKEY_SOCKETS);
if (NULL == sockets_dict) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: no sockets found to answer requests on!\n");
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "launchd check-in: no sockets found to answer requests on!\n");
return ERROR_FD;
}
-
+
if (launch_data_dict_get_count(sockets_dict) > 1) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: some sockets will be ignored!\n");
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "launchd check-in: some sockets will be ignored!\n");
return ERROR_FD;
}
-
- listening_fd_array = launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX":0");
+
+ listening_fd_array =
+ launch_data_dict_lookup(sockets_dict, BUNDLE_ID_PREFIX ":0");
if (NULL == listening_fd_array) {
listening_fd_array = launch_data_dict_lookup(sockets_dict, ":0");
if (NULL == listening_fd_array) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n", BUNDLE_ID_PREFIX);
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "launchd check-in: No known sockets found to answer requests on! \"%s:0\" and \":0\" failed.\n",
+ BUNDLE_ID_PREFIX);
return ERROR_FD;
}
}
-
- if (launch_data_array_get_count(listening_fd_array)!=1) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "launchd check-in: Expected 1 socket from launchd, got %u)\n",
- (unsigned)launch_data_array_get_count(listening_fd_array));
+
+ if (launch_data_array_get_count(listening_fd_array) != 1) {
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "launchd check-in: Expected 1 socket from launchd, got %u)\n",
+ (unsigned) launch_data_array_get_count(listening_fd_array));
return ERROR_FD;
}
-
- listening_fd=launch_data_array_get_index(listening_fd_array, 0);
+
+ listening_fd = launch_data_array_get_index(listening_fd_array, 0);
return launch_data_get_fd(listening_fd);
}
diff --git a/hw/xquartz/mach-startup/launchd_fd.h b/hw/xquartz/mach-startup/launchd_fd.h
index 12caf7193..b1eb7fddc 100644
--- a/hw/xquartz/mach-startup/launchd_fd.h
+++ b/hw/xquartz/mach-startup/launchd_fd.h
@@ -33,4 +33,4 @@
int launchd_display_fd(void);
-#endif /* _XQUARTZ_LAUNCHD_FD_H_ */
+#endif /* _XQUARTZ_LAUNCHD_FD_H_ */
diff --git a/hw/xquartz/mach-startup/mach_startup_types.h b/hw/xquartz/mach-startup/mach_startup_types.h
index 459c750db..d408ceea7 100644
--- a/hw/xquartz/mach-startup/mach_startup_types.h
+++ b/hw/xquartz/mach-startup/mach_startup_types.h
@@ -4,6 +4,6 @@
#define STRING_T_SIZE 1024
typedef char string_t[STRING_T_SIZE];
-typedef string_t * string_array_t;
+typedef string_t *string_array_t;
#endif
diff --git a/hw/xquartz/mach-startup/stub.c b/hw/xquartz/mach-startup/stub.c
index d8e4abdd1..f457aaba0 100644
--- a/hw/xquartz/mach-startup/stub.c
+++ b/hw/xquartz/mach-startup/stub.c
@@ -58,85 +58,105 @@ static char x11_path[PATH_MAX + 1];
static pid_t x11app_pid = 0;
aslclient aslc;
-static void set_x11_path(void) {
+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);
+ 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);
- }
+ 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);
- }
+ 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);
+ 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));
+ strlcpy(x11_path, "/Applications/Utilities/X11.app/Contents/MacOS/X11",
+ sizeof(x11_path));
#endif
}
-static int connect_to_socket(const char *filename) {
+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));
+ 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);
-
+ 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));
+ 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));
+ 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) {
+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);
+ iov[0].iov_len = sizeof(databuf);
msg.msg_iov = iov;
msg.msg_iovlen = 1;
@@ -146,32 +166,39 @@ static void send_fd_handoff(int connected_fd, int launchd_fd) {
msg.msg_namelen = 0;
msg.msg_flags = 0;
- cmsg = CMSG_FIRSTHDR (&msg);
+ 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));
+
+ *((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.");
+ 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)
+__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
+main(int argc, char **argv, char **envp)
+{
int envpc;
kern_return_t kr;
mach_port_t mp;
@@ -185,7 +212,7 @@ int main(int argc, char **argv, char **envp) {
char *asl_facility;
char *server_bootstrap_name = kX11AppBundleId;
- if(getenv("X11_PREFS_DOMAIN"))
+ if (getenv("X11_PREFS_DOMAIN"))
server_bootstrap_name = getenv("X11_PREFS_DOMAIN");
asprintf(&asl_sender, "%s.stub", server_bootstrap_name);
@@ -193,8 +220,8 @@ int main(int argc, char **argv, char **envp) {
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';
+ 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);
@@ -205,103 +232,119 @@ int main(int argc, char **argv, char **envp) {
* time out waiting for it and will just poll for the server.
*/
handler = signal(SIGUSR1, SIG_IGN);
- if(handler == 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) {
+ if (kr != KERN_SUCCESS) {
pid_t child;
- asl_log(aslc, NULL, ASL_LEVEL_WARNING, "Xquartz: Unable to locate waiting server: %s", server_bootstrap_name);
+ 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));
+ if (child == -1) {
+ asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: Could not fork: %s",
+ strerror(errno));
return EXIT_FAILURE;
}
- if(child == 0) {
+ 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);
+ 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++) {
+ for (i = 0; i < 80; i++) {
usleep(250000);
kr = bootstrap_look_up(bootstrap_port, server_bootstrap_name, &mp);
- if(kr == KERN_SUCCESS)
+ if (kr == KERN_SUCCESS)
break;
}
- if(kr != KERN_SUCCESS) {
+ 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));
+ 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);
+ 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) {
+ 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);
+ 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);
+ 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);
+ 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++);
-
+ 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));
+ 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");
+ if (!newargv || !newenvp) {
+ asl_log(aslc, NULL, ASL_LEVEL_ERR,
+ "Xquartz: Memory allocation failure");
return EXIT_FAILURE;
}
-
- for(i=0; i < argc; i++) {
+
+ for (i = 0; i < argc; i++) {
strlcpy(newargv[i], argv[i], STRING_T_SIZE);
}
- for(i=0; i < envpc; i++) {
+ for (i = 0; i < envpc; i++) {
strlcpy(newenvp[i], envp[i], STRING_T_SIZE);
}
@@ -311,7 +354,8 @@ int main(int argc, char **argv, char **envp) {
free(newenvp);
if (kr != KERN_SUCCESS) {
- asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s", mach_error_string(kr));
+ asl_log(aslc, NULL, ASL_LEVEL_ERR, "Xquartz: start_x11_server: %s",
+ mach_error_string(kr));
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-01 15:55:48 +0000