From 0309b6bbb94693f9dd3f2c641baf199c1ba68bff Mon Sep 17 00:00:00 2001
From: jackun <jack.un@gmail.com>
Date: Fri, 27 Nov 2020 19:59:57 +0200
Subject: [PATCH] Escape spaces in file names for `wordexp`

---
 src/overlay_params.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp
index d3360e2e..d78ea2e8 100644
--- a/src/overlay_params.cpp
+++ b/src/overlay_params.cpp
@@ -239,11 +239,17 @@ parse_path(const char *str)
 #ifdef _XOPEN_SOURCE
    // Expand ~/ to home dir
    if (str[0] == '~') {
-      std::string s;
+      std::string s = str;
+      size_t n = 0;
       wordexp_t e;
       int ret;
 
-      if (!(ret = wordexp(str, &e, 0)))
+      while ((n = s.find_first_of(" ", n)) != std::string::npos) {
+         s = s.replace(n, 1, "\\ ");
+         n += 2;
+      }
+
+      if (!(ret = wordexp(s.c_str(), &e, 0)))
          s = e.we_wordv[0];
       wordfree(&e);