From 91d2aba6364ec6685411595ccafea69fe9d20d6c Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 23 Jul 2020 09:26:21 -0700 Subject: Fix spelling/wording issues Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith --- README.md | 2 +- launchd/privileged_startx/server.c | 2 +- startx.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ada1a48..d3d8128 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Xorg mailing list: https://lists.x.org/mailman/listinfo/xorg -The master development code repository can be found at: +The primary development code repository can be found at: https://gitlab.freedesktop.org/xorg/app/xinit diff --git a/launchd/privileged_startx/server.c b/launchd/privileged_startx/server.c index a93cae3..005758d 100644 --- a/launchd/privileged_startx/server.c +++ b/launchd/privileged_startx/server.c @@ -137,7 +137,7 @@ int server_main(const char *dir) { } if (launch_data_get_type(config) == LAUNCH_DATA_ERRNO) { - asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed eith error: %d %s", launch_data_get_errno(config), strerror(launch_data_get_errno(config))); + asl_log(NULL, NULL, ASL_LEVEL_ERR, "launchd checkin failed with error: %d %s", launch_data_get_errno(config), strerror(launch_data_get_errno(config))); exit(EXIT_FAILURE); } diff --git a/startx.cpp b/startx.cpp index dbc4cae..a390f03 100644 --- a/startx.cpp +++ b/startx.cpp @@ -96,7 +96,7 @@ if [ x`defaults read $X11_PREFS_DOMAIN cache_fonts` = x1 ] ; then fi if [ -x __libexecdir__/privileged_startx ] ; then - # Don't push this into the background becasue it can cause + # Don't push this into the background because it can cause # a race to create /tmp/.X11-unix __libexecdir__/privileged_startx fi -- cgit v1.2.3 From e2430bcb8327682340d985f89ad5137efa2f0d4f Mon Sep 17 00:00:00 2001 From: Rickie Schroeder <1187-Gregg16@users.noreply.gitlab.freedesktop.org> Date: Fri, 28 Aug 2020 13:34:05 +0000 Subject: startx: use uname -n instead of hostname startx calls hostname to obtain the hostname, but this is not defined by POSIX, so not guaranteed to work. The script already does some checks to deal with different hostname implementations on Linux. Using uname -n instead fixes this in a portable way. --- startx.cpp | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/startx.cpp b/startx.cpp index a390f03..33b9eb7 100644 --- a/startx.cpp +++ b/startx.cpp @@ -251,18 +251,7 @@ if [ x"$enable_xauth" = x1 ] ; then removelist= XCOMM set up default Xauth info for this machine - case `uname` in - Linux*) - if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then - hostname=`hostname -f` - else - hostname=`hostname` - fi - ;; - *) - hostname=`hostname` - ;; - esac + hostname=`uname -n` authdisplay=${display:-:0} #if defined(HAS_COOKIE_MAKER) && defined(MK_COOKIE) -- cgit v1.2.3