From 55f09b61527e0cd868acdf3f32b077a882ab94b3 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Wed, 9 Dec 2020 08:31:09 +0100
Subject: Use get_expanded_path() in cmd_senfile()

---
 src/command/cmd_funcs.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'src/command')

diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index fd9d2ffd..68153270 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -4854,18 +4854,12 @@ gboolean
 cmd_sendfile(ProfWin* window, const char* const command, gchar** args)
 {
     jabber_conn_status_t conn_status = connection_get_status();
-    char* filename = args[0];
+    gchar* filename;
     char* alt_scheme = NULL;
     char* alt_fragment = NULL;
 
     // expand ~ to $HOME
-    if (filename[0] == '~' && filename[1] == '/') {
-        if (asprintf(&filename, "%s/%s", getenv("HOME"), filename + 2) == -1) {
-            return TRUE;
-        }
-    } else {
-        filename = strdup(filename);
-    }
+    filename = get_expanded_path(args[0]);
 
     if (access(filename, R_OK) != 0) {
         cons_show_error("Uploading '%s' failed: File not found!", filename);
-- 
cgit 1.4.1-2-gfad0

 href='/danisanti/profani-tty/about/'>about</a> <a href='/danisanti/profani-tty/'>summary</a> <a href='/danisanti/profani-tty/refs/?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>refs</a> <a href='/danisanti/profani-tty/log/tests/unittests/test_callbacks.h'>log</a> <a class='active' href='/danisanti/profani-tty/tree/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>tree</a> <a href='/danisanti/profani-tty/commit/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>commit</a> <a href='/danisanti/profani-tty/diff/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>diff</a> <a href='/danisanti/profani-tty/stats/tests/unittests/test_callbacks.h'>stats</a></td><td class='form'><form class='right' method='get' action='/danisanti/profani-tty/log/tests/unittests/test_callbacks.h'>
<input type='hidden' name='id' value='4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/danisanti/profani-tty/tree/?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>root</a>/<a href='/danisanti/profani-tty/tree/tests?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>tests</a>/<a href='/danisanti/profani-tty/tree/tests/unittests?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>unittests</a>/<a href='/danisanti/profani-tty/tree/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>test_callbacks.h</a></div><div class='content'>blob: 271302417bbf35f2979ebd089afd17469a2ef488 (<a href='/danisanti/profani-tty/plain/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>plain</a>) (<a href='/danisanti/profani-tty/blame/tests/unittests/test_callbacks.h?id=4d93df4aba232c6999a8edd6fd0fbdc0174f9e07'>blame</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
</pre></td>
<td class='lines'><pre><code>