diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-31 20:22:25 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-31 20:22:25 +0000 |
commit | c050b2ae9905a427773c8634b908b4199a04dca7 (patch) | |
tree | 460d0c616392df260d436a640686453453c47f8b /pbx | |
parent | 2a39386ffc1fb60f6c411e4ab808b9eae158c760 (diff) |
Fix add include (bug #966) and small update to bug 890
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2103 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'pbx')
-rwxr-xr-x | pbx/pbx_config.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c index 7f7af1b10..e017be79c 100755 --- a/pbx/pbx_config.c +++ b/pbx/pbx_config.c @@ -689,12 +689,12 @@ static char *complete_context_remove_extension(char *line, char *word, int pos, */ static int handle_context_add_include(int fd, int argc, char *argv[]) { - if (argc != 4) return RESULT_SHOWUSAGE; + if (argc != 5) return RESULT_SHOWUSAGE; /* third arg must be 'in' ... */ - if (strcmp(argv[2], "in")) return RESULT_SHOWUSAGE; + if (strcmp(argv[3], "in")) return RESULT_SHOWUSAGE; - if (ast_context_add_include(argv[3], argv[1], registrar)) { + if (ast_context_add_include(argv[4], argv[2], registrar)) { switch (errno) { case ENOMEM: ast_cli(fd, "Out of memory for context addition\n"); break; @@ -709,7 +709,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[]) case ENOENT: case EINVAL: ast_cli(fd, "There is no existence of context '%s'\n", - errno == ENOENT ? argv[3] : argv[1]); break; + errno == ENOENT ? argv[4] : argv[2]); break; default: ast_cli(fd, "Failed to include '%s' in '%s' context\n", @@ -720,7 +720,7 @@ static int handle_context_add_include(int fd, int argc, char *argv[]) /* show some info ... */ ast_cli(fd, "Context '%s' included in '%s' context\n", - argv[1], argv[3]); + argv[2], argv[3]); return RESULT_SUCCESS; } |