Merge remote-tracking branch 'vanilla/stable' into gaps

RELEASE-NOTES-4.20.1

@@ -0,0 +1,27 @@
+
+ ┌──────────────────────────────┐
+ │ Release notes for i3 v4.20.1 │
+ └──────────────────────────────┘
+
+This is i3 v4.20.1. This version is considered stable. All users of i3 are
+strongly encouraged to upgrade.
+
+ ┌────────────────────────────┐
+ │ Bugfixes                   │
+ └────────────────────────────┘
+
+  • i3bar: fix crash with multiple monitors
+  • xmlto: fix broken .TH line by extending title length
+  • i3-msg: fix --raw short form (-r) in manpage
+  • libi3: add missing sys/stat.h header
+  • use getcwd(NULL, 0) instead of GNU extension get_current_dir_name()
+
+ ┌────────────────────────────┐
+ │ Thanks!                    │
+ └────────────────────────────┘
+
+Thanks for testing, bugfixes, discussions and everything I forgot go out to:
+
+  rvalieris, Jakob Haufe, lycurgus, Baptiste Daroussin
+
+-- Michael Stapelberg, 2021-11-03

i3bar/src/ipc.c

@@ -173,6 +173,9 @@ static bool strings_differ(char *a, char *b) {
     if (a_null != b_null) {
         return true;
     }
+    if (a_null && b_null) {
+        return false;
+    }
     return strcmp(a, b) != 0;
 }
 

include/libi3.h

@@ -15,6 +15,7 @@
 #include <stdbool.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <sys/stat.h>
 #include <xcb/xcb.h>
 #include <xcb/xproto.h>
 #include <xcb/xcb_keysyms.h>

man/i3-msg.man

@@ -36,7 +36,7 @@ Instead of exiting right after receiving the first subscribed event,
 wait indefinitely for all of them. Can only be used with "-t subscribe".
 See the "subscribe" IPC message type below for details.
 
-*-q, --raw*::
+*-r, --raw*::
 Display the raw JSON reply instead of pretty-printing errors (for commands) or
 displaying the top-level config file contents (for GET_CONFIG).
 

meson.build

@@ -6,7 +6,7 @@
 project(
   'i3',
   'c',
-  version: '4.20',
+  version: '4.20.1',
   default_options: [
     'c_std=c11',
     'warning_level=1',  # enable all warnings (-Wall)
@@ -229,6 +229,8 @@ if get_option('mans')
       output: '@[email protected]',
       command: [
         xmlto,
+        '--stringparam',
+        'man.th.title.max.length=30',
         'man',
         '-o',
         '@OUTDIR@',

release.sh

@@ -3,8 +3,8 @@
 
 set -eu
 
-export RELEASE_VERSION="4.19"
-export PREVIOUS_VERSION="4.18.3"
+export RELEASE_VERSION="4.20"
+export PREVIOUS_VERSION="4.19.2"
 export RELEASE_BRANCH="next"
 
 if [ ! -e "../i3.github.io" ]
@@ -37,8 +37,8 @@ STARTDIR=$PWD
 
 TMPDIR=$(mktemp -d)
 cd $TMPDIR
-if ! wget https://i3wm.org/downloads/i3-${PREVIOUS_VERSION}.tar.bz2; then
-	echo "Could not download i3-${PREVIOUS_VERSION}.tar.bz2 (required for comparing files)."
+if ! wget https://i3wm.org/downloads/i3-${PREVIOUS_VERSION}.tar.xz; then
+	echo "Could not download i3-${PREVIOUS_VERSION}.tar.xz (required for comparing files)."
 	exit 1
 fi
 git clone --quiet --branch "${RELEASE_BRANCH}" https://github.com/i3/i3
@@ -100,6 +100,11 @@ git config --add remote.origin.push "+refs/heads/stable:refs/heads/stable"
 cd "${TMPDIR}"
 mkdir debian
 
+# Copy over the changelog because we expect it to be locally modified in the
+# start directory.
+cp "${STARTDIR}/debian/changelog" i3/debian/changelog
+(cd i3 && git add debian/changelog && git commit -m 'Update debian/changelog')
+
 cat > ${TMPDIR}/Dockerfile <<EOT
 FROM debian:sid
 RUN sed -i 's,^deb \(.*\),deb \1\ndeb-src \1,g' /etc/apt/sources.list

src/config_parser.c

@@ -864,7 +864,7 @@ parse_file_result_t parse_file(struct parser_ctx *ctx, const char *f, IncludedFi
     FILE *fstr;
     char buffer[4096], key[512], value[4096], *continuation = NULL;
 
-    char *old_dir = get_current_dir_name();
+    char *old_dir = getcwd(NULL, 0);
     char *dir = NULL;
     /* dirname(3) might modify the buffer, so make a copy: */
     char *dirbuf = sstrdup(f);