aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-06-09 06:20:45 +00:00
Code

Merge pull request #1462 from mauke/upgrade-tilde-expand

Browse Source 
expand ~ to $HOME in /upgrade

(cherry picked from commit 5c42345ea2)
This commit is contained in:
ailin-nemui 2023-04-04 13:12:50 +00:00 committed by Ailin Nemui
parent 160c2401a5
commit 6b65492b65
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/session.c
View File

@ -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 */