Ticket #53108: launchd.patch

(a) a/channels.c.orig vs. (b) b/channels.c

@@ -4565 +4565 @@
          */
 
 #ifdef __APPLE__
-        /* Check if display is a path to a socket (as set by launchd). */
+        /* Check if the display is a path to a socket (as set by launchd). */
         {
                 char path[PATH_MAX];
+                struct stat sbuf;
+                int is_path_to_socket = 0;
 
-                if (is_path_to_xsocket(display, path, sizeof(path))) {
-                        debug("x11_connect_display: $DISPLAY is launchd");
-
-                        /* Create a socket. */
+                strlcpy(path, display, sizeof(path));
+                if (0 == stat(path, &sbuf)) {
+                        is_path_to_socket = 1;
+                } else {
+                        char *dot = strrchr(path, '.');
+                        if (dot) {
+                                *dot = '\0';
+                                /* screen = atoi(dot 1); */
+                                if (0 == stat(path, &sbuf)) {
+                                        is_path_to_socket=1;
+                                }
+                        }
+                }
+  
+                if (is_path_to_socket) {
                         sock = connect_local_xsocket_path(path);
                         if (sock < 0)
                                 return -1;