mirrors/zathura
1
0
Fork 0
mirror of https://git.pwmt.org/pwmt/zathura.git synced 2024-12-28 23:26:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix memory leak, use girara_get_home_directory

Browse source
This commit is contained in:
Sidharth Kapur 2015-10-05 15:49:04 -05:00
parent 7991618d25
commit 8bc9aa8af7
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
zathura/zathura.c
View file

@ -546,7 +546,7 @@ document_info_open(gpointer data)
return FALSE; return FALSE;
} }
const char* char*
get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar) get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar)
{ {
bool basename_only = false; bool basename_only = false;
@ -565,10 +565,11 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar
girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde); girara_setting_get(zathura->ui.session, "window-title-home-tilde", &home_tilde);
} }
size_t file_path_len = file_path ? strlen(file_path) : 0;
if (home_tilde) { if (home_tilde) {
char *home = getenv("HOME"); char *home = girara_get_home_directory(NULL);
size_t home_len = home ? strlen(home) : 0; size_t home_len = home ? strlen(home) : 0;
size_t file_path_len = file_path ? strlen(file_path) : 0;
if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) { if (home_len > 1 && strncmp(home, file_path, home_len) == 0 && (!file_path[home_len] || file_path[home_len] == '/')) {
// Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0' // Length should be total length of path - length of $HOME + 1 for '~' + 1 for '\0'
@ -579,13 +580,20 @@ get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar
tdir[tlen - 1] = '\0'; tdir[tlen - 1] = '\0';
return tdir; return tdir;
} else { } else {
return file_path; char* path = g_try_malloc(sizeof(char) * strlen(file_path));
strncpy(path, file_path, file_path_len);
return path;
} }
} else { } else {
return file_path; char* path = g_try_malloc(sizeof(char) * strlen(file_path));
strncpy(path, file_path, file_path_len);
return path;
} }
} else { } else {
return zathura_document_get_basename(zathura->document); const char* basename = zathura_document_get_basename(zathura->document);
char* basename_copy = g_try_malloc(sizeof(char) * strlen(basename));
strncpy(basename_copy, basename, strlen(basename));
return basename_copy;
} }
} }
@ -708,8 +716,9 @@ document_open(zathura_t* zathura, const char* path, const char* password,
zathura->bisect.end = number_of_pages - 1; zathura->bisect.end = number_of_pages - 1;
/* update statusbar */ /* update statusbar */
girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, char* filename = get_formatted_filename(zathura, file_path, true);
get_formatted_filename(zathura, file_path, true)); girara_statusbar_item_set_text(zathura->ui.session, zathura->ui.statusbar.file, filename);
g_free(filename);
/* install file monitor */ /* install file monitor */
file_uri = g_filename_to_uri(file_path, NULL, NULL); file_uri = g_filename_to_uri(file_path, NULL, NULL);
@ -876,7 +885,9 @@ document_open(zathura_t* zathura, const char* path, const char* password,
} }
/* update title */ /* update title */
girara_set_window_title(zathura->ui.session, get_formatted_filename(zathura, file_path, false)); char* formatted_filename = get_formatted_filename(zathura, file_path, false);
girara_set_window_title(zathura->ui.session, formatted_filename);
g_free(formatted_filename);
g_free(file_uri); g_free(file_uri);
@ -1128,11 +1139,11 @@ statusbar_page_number_update(zathura_t* zathura)
girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title); girara_setting_get(zathura->ui.session, "window-title-page", &page_number_in_window_title);
if (page_number_in_window_title == true) { if (page_number_in_window_title == true) {
char* title = g_strdup_printf("%s %s", char* filename = get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false);
get_formatted_filename(zathura, zathura_document_get_path(zathura->document), false), char* title = g_strdup_printf("%s %s", filename, page_number_text);
page_number_text);
girara_set_window_title(zathura->ui.session, title); girara_set_window_title(zathura->ui.session, title);
g_free(title); g_free(title);
g_free(filename);
} }
g_free(page_number_text); g_free(page_number_text);

2
zathura/zathura.h
View file

@ -286,7 +286,7 @@ void zathura_set_argv(zathura_t* zathura, char** argv);
* @param file_path The filename to be formatted * @param file_path The filename to be formatted
* @param statusbar True if for statusbar, false if for window title * @param statusbar True if for statusbar, false if for window title
*/ */
const char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar); char* get_formatted_filename(zathura_t* zathura, const char* file_path, bool statusbar);
/** /**
* Opens a file * Opens a file