Commit Graph

57 Commits

Author SHA1 Message Date
Matt Turner 08adf41f63 Replace malloc/strlen/strcpy with strdup.
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
Signed-off-by: Matt Turner <mattst88@gmail.com>
2010-08-27 19:05:48 -04:00
Mikhail Gusarov 7287ef9e6c Remove unnecessary parentheses around return values in functions
This patch was generated by the following Perl code:

perl -i -pe 's/([^_])return\s*\(\s*([^(]+?)\s*\)s*;(\s+(\n))?/$1return $2;$4/g;'

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Daniel Stone <daniel@fooishbar.org>
Signed-off-by: Keith Packard <keithp@keithp.com>
2010-06-10 06:42:42 -07:00
Jeremy Huddleston 37f0b45dbe XQuartz: Fix a build failure on Tiger
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-05-16 13:12:31 -07:00
Jeremy Huddleston 0e342add77 darwin: Correct inline assembly for ___crashreporter_info__
It was missing an underscore.

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-04-01 15:32:51 -07:00
Jeremy Huddleston 436d0bb9cc darwin: Generate crash reports on FatalError()
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Acked-by: Adam Jackson <ajax@redhat.com>
2010-03-29 09:37:17 -07:00
Jeremy Huddleston 4127e8e5be XQuartz: clang static analysis fixes
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2010-02-15 15:03:49 -08:00
Jeremy Huddleston 4677b5a800 XQuartz: Allow better compatability with older versions of xinit
If we are id="org.x" and the launchd socket is ":0", we will claim
the socket to match the old behavior before we prefixed the
socket name with our id.

Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
2009-11-23 18:00:31 -08:00
Jeremy Huddleston 24e640e1fa XQuartz: Fix a possible minor memory leak 2009-10-02 19:20:24 -07:00
Jeremy Huddleston f3223c71cf XQuartz: Remove the redundant xquartz_resetenv_display
unsetenv(DISPLAY) takes care of this for us anyway
(cherry picked from commit d2263645d839c9edeedea0835d26f1f41b37f70e)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston 9b98b88322 XQuartz: Query the BundleIdentifier from the bundle in X11.bin rather than using the configure option.
This lets X11.bin drop into any .app ... the Info.plist and Xquartz binary need to have it hardcoded still.
(cherry picked from commit 9ad16b8e50b13eb6d0cd20386d07aa8d7320f671)
2009-09-29 00:34:41 -07:00
Jeremy Huddleston 67a51cd9ef XQuartz: Fix a bunch of compilation warnings about style
(cherry picked from commit 54000bdcbca52a2de31f7c1a1147de6d8e9dbbb8)
2009-09-27 23:31:35 -07:00
Jeremy Huddleston 081f72390a XQuartz: Fix "warning: function declaration isn’t a prototype" noise
(cherry picked from commit 9a77905a975e562daa4230739937bbb0b4caf087)
2009-09-06 14:06:16 -07:00
Jeremy Huddleston 1747120043 XQuartz: Fix a strcpy/strcmp typo
(cherry picked from commit 701c24da3ef76a05ccb2d7e84ccfa1b7c5d38e15)
2009-09-05 02:53:59 -07:00
Jeremy Huddleston 1f61bbeffd XQuartz: Check the DISPLAY environment variable to see if the socket at startup is ours. If not, ignore it and fork/exec startx.
(cherry picked from commit 3d5e10cce360a04bf917227615fb9b825675124f)
2009-09-04 00:42:44 -07:00
Jeremy Huddleston 0a361d0e5f XQuartz: Use --with-launchd-id-prefix for consistency with xinit
Also actually honor LAUNCHD_ID_PREFIX and APPLE_APPLICATION_NAME
(cherry picked from commit 990038ab006b2f5e03dcef385514ba4e4584bd25)
2009-09-04 00:42:31 -07:00
Jeremy Huddleston b8050bb6de XQuartz: Don't leave zombied processes at startup
(cherry picked from commit 40c1406830588fa85d880e9f4e9ca570db1db306)
2009-06-27 18:26:08 -07:00
Jeremy Huddleston 8f04a52373 XQuartz: Run applications via '/bin/sh -c ...' to support users who expect shell parsing
(cherry picked from commit 67455e716e3ecffd528930479192785958d37988)
2008-12-21 21:35:33 -08:00
Jeremy Huddleston 76351d2faf XQuartz: Avoid using login /bin/sh blech. Just use a bash script to start the app, so it will inherit the right environment
(cherry picked from commit f4b7ad9cc6b0c99fc7ee8516c4bf858ece938148)
2008-12-10 15:07:52 -08:00
Jeremy Huddleston e5ce6e198f XQuartz: unset DISPLAY if we didn't get a launchd socket handoff
(cherry picked from commit b959727f38733009c6381cc8ca06b5984257bdac)
2008-12-10 15:07:35 -08:00
Jeremy Huddleston ecaaf0462d XQuartz: unsetenv(DISPLAY) if we're not org.x.X11
Also some prefix related fixes.
(cherry picked from commit fd459e96581a883e30323c840b71004aa0747169)
2008-12-10 15:07:26 -08:00
Jeremy Huddleston ea94995982 XQuartz: Removed some debug spew
(cherry picked from commit 370dcf11b360b87aa24cace35eb615419057fda0)
2008-12-10 15:07:15 -08:00
Jeremy Huddleston a9796c7bc4 XQuarz: Setup our PATH and PWD earlier, so our initial client benefits from it as well...
(cherry picked from commit cbae2b447357b3fed6ff19414c60dd3792045600)
2008-11-28 13:02:41 -08:00
Jeremy Huddleston 94df1ab7f0 XQuartz: Force X11Controller to reset a broken DISPLAY envvar.
(cherry picked from commit f1a52b5b5ac31702497937efe3ac578be9a6c54f)
2008-11-25 11:53:06 -08:00
Jeremy Huddleston 0b314c50a2 XQuartz: Removed hardcoded org.x.X11 from MachIPC as well
(cherry picked from commit b4add7826d485600a13eba6a9c7be533f2c02d51)
2008-11-25 11:52:59 -08:00
Jeremy Huddleston 13df49dca2 XQuartz: Use the environment to pass the bundle's prefs domain on to xinit/quartz-wm for Tiger or no-launchd-LEOPARD
(cherry picked from commit fbf4b0d33fa5dc618c3191a4e823232dfa33cd95)
2008-11-25 00:54:47 -08:00
Jeremy Huddleston 40187f782b XQuartz: Dead code removal
(cherry picked from commit eeb323612e0adbea37befed31bbaa1d295728385)
2008-11-25 00:54:42 -08:00
Jeremy Huddleston ab12c75162 XQuartz: More Tiger cleanup: bootstrap_strerror
(cherry picked from commit 37f535aff3e9a7a02711daa98152cdff97745622)
2008-11-25 00:54:17 -08:00
Jeremy Huddleston 93d7cd31c5 XQuartz: Purge the old XQUARTZ_EXPORTS_LAUNCHD_FD option
(cherry picked from commit 490756c7fbe0792c4bd6ae434e7a48e0beffa5c7)
2008-10-31 15:48:15 -07:00
Jeremy Huddleston f12d7ad164 XQuartz: Pass along SIGINT and SIGTERM from the stub to X11.app
(cherry picked from commit 183ca5d68b4f34e248749f304ce140de11bd451b)
2008-10-28 22:01:40 -07:00
Jeremy Huddleston 1119fe136f XQuartz: Changed around fd handoff model to be more robust
(cherry picked from commit 4fe605c2bc62d50e0b5764d9edda245af227630b)
2008-09-12 15:26:01 -07:00
Jeremy Huddleston b3836e5bdd XQuartz: Cleaned up our sleeping before adding the launchd socket.
(cherry picked from commit ebfe49dfca6e04d66232bad760f522629397cc35)
(cherry picked from commit 2cf74a76d54d795cfc3c0380a526b9177327782d)
2008-09-03 09:24:59 -07:00
Jeremy Huddleston 8abcc12fdd XQuartz: Added debugging output to the crash log to help track down two crashes, since people don't often report their system.log spew.
(cherry picked from commit aaf0f71db197526b6b866cc1b39fbdfe051879ef)
2008-08-29 20:55:25 -07:00
Jeremy Huddleston 7930ea9116 XQuartz: Made a note to come back to the xinitrc race condition in the 1.5 branch when we move up to it.
(cherry picked from commit 54a882dcbdccef3f3eb4e6398e13c88185a8986c)
2008-08-26 20:19:44 -07:00
Jeremy Huddleston e72b1d21e4 XQuartz: Now properly disable xauth checking on launchd socket and mostly fix the xinitrc / launchd race condition 2008-08-06 13:37:21 -07:00
Jeremy Huddleston 26d31ad1c7 XQuartz: Added code and made comments more helpful for debugging first-client-auth bug.
(cherry picked from commit a8f0d32216e321b8ae6da182be9b1ea792f6e004)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston 0ef3243fb5 XQuartz: More fd handoff cleanup.
(cherry picked from commit 199d2dcb708c9f9d6b9ede149ea0fe9fba6c007c)
2008-08-05 18:47:35 -07:00
Jeremy Huddleston 6836f9aac8 XQUartz: UI Cleanup. Removed done/cancel buttons from Applications->Customize
(cherry picked from commit d3157ca45c1f88edd040d721c1e944b9d2c090aa)
2008-08-05 18:47:34 -07:00
Jeremy Huddleston 30851efdd4 XQuartz: Fixed first-client-can't-connect bug
Readded the old exec() server startup path for regression testing.
Don't use the dynamic fd addition code since it's not quite working correctly.
(cherry picked from commit 08f3fe153edc5ab4ca010e8ce82d5c3fc0ddb72c)
2008-08-05 12:54:51 -07:00
Jeremy Huddleston 90dd2de845 XQuartz: Some fd handoff cleanup.
(cherry picked from commit 9c20a4804d97e67a988f00f49866997209cce518)
2008-07-11 10:13:32 -07:00
Jeremy Huddleston e69b9f9ca4 XQuartz: Set noPanoramixExtension earlier to avoid a possible race.
(cherry picked from commit 49668e8a88137e9f258eae970826883b88b7d8ba)
2008-07-11 10:13:13 -07:00
Jeremy Huddleston c180a52332 XQuartz: Removed code path for old startup
(cherry picked from commit a9ee6b0d00fab01a78408a85e6542e88c19fda7c)
2008-06-10 10:51:58 -07:00
Jeremy Huddleston 40855d8000 XQuartz: Removed async debugging sleep
(cherry picked from commit 7812a8bdf9fab651ea5c07b852b2999547ec628d)
2008-06-04 12:24:15 -07:00
Jeremy Huddleston ee86b75119 XQuartz: use a condition variable to signal when darwinEvents is ready rather than polling
(cherry picked from commit ff1c443cadf11d12a7d939e51194f6105153870e)
2008-06-04 12:24:12 -07:00
Jeremy Huddleston 38da26cd36 XQuartz: Don't forget to destroy the mutex and cond after we're done with them
(cherry picked from commit c3558bb8cd889e5b957190e9f5d23afad1e17b72)
2008-06-04 12:24:10 -07:00
Jeremy Huddleston ea40fcf434 XQuartz: Fork for trigger
(cherry picked from commit dd0f8a0f59593d7831fe09a2a086fcd57c84910e)
2008-06-04 12:24:06 -07:00
Jeremy Huddleston 2393dae6ff XQuartz: Switched over to new startup path for testing. Cleaned it up a bit. Server still crashes when using the icon to launch =/
(cherry picked from commit 7f840e9dc180421eaa9b0ea3ab993fdd5b2466e5)
2008-06-04 12:24:04 -07:00
Jeremy Huddleston 7082929ef7 XQuartz: A 2 second delay for launchd socket connections should be sufficient.
(cherry picked from commit 2bb4251b3c6b30dbf1a556e1b51e6f03f02d2529)
2008-05-23 02:32:37 -07:00
Jeremy Huddleston 225dddbaed XQuartz: Move the launchd display grabbing into mach_startup
(cherry picked from commit c3866c98d23020d2151977ee1177b6054d05832e)
2008-05-23 02:31:41 -07:00
Jeremy Huddleston 3a22190061 XQuartz: Fixed a few issues with fd passing... still not working =(
(cherry picked from commit 7dd351271522b475d8017e4bd1618f12817ee2fa)
2008-05-23 02:31:38 -07:00
Jeremy Huddleston bb687465d0 XQuartz: First stab at SCM_RIGHTS passing the $DISPLAY launchd fd from the stub to server
(cherry picked from commit cccee9cfc29f85cca635df3b8dd54199b45c4df8)
2008-05-19 02:47:18 -07:00