[Asterisk-cvs] asterisk/pbx pbx_config.c,1.33,1.34

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/pbx
In directory mongoose.digium.com:/tmp/cvs-serv30669/pbx

Modified Files:
	pbx_config.c 
Log Message:
Fix add include (bug #966) and small update to bug 890


Index: pbx_config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- pbx_config.c	28 Jan 2004 01:29:47 -0000	1.33
+++ pbx_config.c	31 Jan 2004 20:22:25 -0000	1.34
@@ -689,12 +689,12 @@
  */
 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 @@
 			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 @@
 
 	/* show some info ... */
 	ast_cli(fd, "Context '%s' included in '%s' context\n",
-		argv[1], argv[3]);
+		argv[2], argv[3]);
 
 	return RESULT_SUCCESS;
 }