aniani/profanity
1
1
Fork 0
mirror of https://github.com/profanity-im/profanity.git synced 2025-02-02 15:08:15 -05:00
Code

Expand ~ in unique_filename_from_url()

Browse Source 
unique_filename_from_url() is used for `/url save`.
It doesn't recognize ~ by itself, we need to expand it first.

Mentioned in
https://github.com/profanity-im/profanity/pull/1375#pullrequestreview-547892462
This commit is contained in:
Michael Vetter 2020-12-09 08:25:37 +01:00
parent 7a319df6c8
commit a2291b36c4
1 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common.c
View File

@ -628,19 +628,41 @@ _basename_from_url(const char* url)
return basename; return basename;
} }
gchar*
get_expanded_path(const char *path)
{
GString* exp_path = g_string_new("");
gchar *result;
if (strlen(path) >= 2 && path[0] == '~' && path[1] == '/') {
g_string_printf(exp_path, "%s/%s", getenv("HOME"), path+2);
} else {
g_string_printf(exp_path, "%s", path+2);
}
result = exp_path->str;
g_string_free(exp_path, FALSE);
return result;
}
gchar* gchar*
unique_filename_from_url(const char* url, const char* path) unique_filename_from_url(const char* url, const char* path)
{ {
gchar *realpath;
// Default to './' as path when none has been provided. // Default to './' as path when none has been provided.
if (path == NULL) { if (path == NULL) {
path = "./"; realpath = "./";
} else {
realpath = get_expanded_path(path);
} }
// Resolves paths such as './../.' for path. // Resolves paths such as './../.' for path.
GFile* target = g_file_new_for_commandline_arg(path); GFile* target = g_file_new_for_commandline_arg(realpath);
gchar* filename = NULL; gchar* filename = NULL;
if (_has_directory_suffix(path) || g_file_test(path, G_FILE_TEST_IS_DIR)) { if (_has_directory_suffix(realpath) || g_file_test(realpath, G_FILE_TEST_IS_DIR)) {
// The target should be used as a directory. Assume that the basename // The target should be used as a directory. Assume that the basename
// should be derived from the URL. // should be derived from the URL.
char* basename = _basename_from_url(url); char* basename = _basename_from_url(url);
@ -654,11 +676,13 @@ unique_filename_from_url(const char* url, const char* path)
gchar* unique_filename = _unique_filename(filename); gchar* unique_filename = _unique_filename(filename);
if (unique_filename == NULL) { if (unique_filename == NULL) {
g_free(filename); g_free(filename);
g_free(realpath);
return NULL; return NULL;
} }
g_object_unref(target); g_object_unref(target);
g_free(filename); g_free(filename);
g_free(realpath);
return unique_filename; return unique_filename;
} }