From 6b65492b65382215fc4eae047b024077a53ce0cc Mon Sep 17 00:00:00 2001
From: ailin-nemui <ailin-nemui@users.noreply.github.com>
Date: Tue, 4 Apr 2023 13:12:50 +0000
Subject: [PATCH] Merge pull request #1462 from mauke/upgrade-tilde-expand

expand ~ to $HOME in /upgrade

(cherry picked from commit 5c42345ea23a96bd0fbc28036af36e5db45d6059)
---
 src/core/session.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/core/session.c b/src/core/session.c
index 5fe481fb..3a63a785 100644
--- a/src/core/session.c
+++ b/src/core/session.c
@@ -26,6 +26,7 @@
 #include <irssi/src/core/net-sendbuffer.h>
 #include <irssi/src/core/pidwait.h>
 #include <irssi/src/lib-config/iconfig.h>
+#include <irssi/src/core/misc.h>
 
 #include <irssi/src/core/chat-protocols.h>
 #include <irssi/src/core/servers.h>
@@ -59,13 +60,19 @@ void session_upgrade(void)
 static void cmd_upgrade(const char *data)
 {
 	CONFIG_REC *session;
-	char *session_file, *str;
+	char *session_file, *str, *name;
 	char *binary;
 
 	if (*data == '\0')
-		data = irssi_binary;
+		name = irssi_binary;
+	else
+		name = convert_home(data);
 
-	if ((binary = g_find_program_in_path(data)) == NULL)
+	binary = g_find_program_in_path(name);
+	if (name != irssi_binary)
+		g_free(name);
+
+	if (binary == NULL)
 		cmd_return_error(CMDERR_PROGRAM_NOT_FOUND);
 
 	/* save the session */