aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Merge pull request #741 from LemonBoy/complete

Browse Source 
Complete filenames ending with a slash
This commit is contained in:
ailin-nemui 2017-09-05 10:17:22 +02:00 committed by GitHub
commit be70fa5eb7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/fe-common/core/completion.c
View File

@ -321,6 +321,10 @@ GList *filename_complete(const char *path, const char *default_path)
g_return_val_if_fail(path != NULL, NULL); g_return_val_if_fail(path != NULL, NULL);
if (path[0] == '\0') {
return NULL;
}
list = NULL; list = NULL;
/* get directory part of the path - expand ~/ */ /* get directory part of the path - expand ~/ */
@ -350,7 +354,14 @@ GList *filename_complete(const char *path, const char *default_path)
g_free_and_null(dir); g_free_and_null(dir);
} }
len = strlen(path);
/* g_path_get_basename() returns the component before the last slash if
* the path ends with a directory separator, that's not what we want */
if (len > 0 && path[len - 1] == G_DIR_SEPARATOR) {
basename = g_strdup("");
} else {
basename = g_path_get_basename(path); basename = g_path_get_basename(path);
}
len = strlen(basename); len = strlen(basename);
/* add all files in directory to completion list */ /* add all files in directory to completion list */