kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow filename completion on zero-length modules, remove a memory leak, remove

Browse Source 
a file descriptor leak, and make filename completion thread-safe.
Patched and tested by tilghman.
(Closes issue #11681)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@97350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-01-09 00:44:14 +00:00
parent 34f994f017
commit 1f14e0cf39
2 changed files with 51 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
main/cli.c
View File

@@ -1248,7 +1248,7 @@ static char *complete_mod_4(const char *line, const char *word, int pos, int sta
static char *complete_fn_2(const char *line, const char *word, int pos, int state)
{
char *c;
char *c, *d;
char filename[256];
if (pos != 1)
@@ -1259,17 +1259,20 @@ static char *complete_fn_2(const char *line, const char *word, int pos, int stat
else
snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_MODULE_DIR, word);
c = filename_completion_function(filename, state);
c = d = filename_completion_function(filename, state);
if (c && word[0] != '/')
c += (strlen(ast_config_AST_MODULE_DIR) + 1);
if (c)
c = strdup(c);
free(d);
return c ? strdup(c) : c;
return c;
}
static char *complete_fn_3(const char *line, const char *word, int pos, int state)
{
char *c;
char *c, *d;
char filename[256];
if (pos != 2)
@@ -1280,12 +1283,15 @@ static char *complete_fn_3(const char *line, const char *word, int pos, int stat
else
snprintf(filename, sizeof(filename), "%s/%s", ast_config_AST_MODULE_DIR, word);
c = filename_completion_function(filename, state);
c = d = filename_completion_function(filename, state);
if (c && word[0] != '/')
c += (strlen(ast_config_AST_MODULE_DIR) + 1);
if (c)
c = strdup(c);
free(d);
return c ? strdup(c) : c;
return c;
}
static int group_show_channels(int fd, int argc, char *argv[])