[Asterisk-cvs] asterisk/apps app_directory.c,1.23,1.24

[markster at lists.digium.com]

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

Modified Files:
	app_directory.c 
Log Message:
Tilghman's directory fix (bug #1892)


Index: app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- app_directory.c	22 Jun 2004 19:32:52 -0000	1.23
+++ app_directory.c	23 Jun 2004 00:06:46 -0000	1.24
@@ -267,6 +267,9 @@
 					case '1':
 						/* user pressed '1' and extensions exists */
 						lastuserchoice = res;
+						strncpy(chan->context, dialcontext, sizeof(chan->context) - 1);
+						strncpy(chan->exten, v->name, sizeof(chan->exten) - 1);
+						chan->priority = 0;
 						break;
 					case '*':
 						/* user pressed '*' to skip something found */
@@ -289,7 +292,7 @@
 				res = 1;
 			return res;
 		}
-		
+		return 0;
 	}
 	return res;
 }
@@ -301,7 +304,7 @@
 	struct ast_config *cfg;
 	char *context, *dialcontext, *dirintro;
 	if (!data) {
-		ast_log(LOG_WARNING, "directory requires an argument (context)\n");
+		ast_log(LOG_WARNING, "directory requires an argument (context[,dialcontext])\n");
 		return -1;
 	}
 	cfg = ast_load(DIRECTORY_CONFIG);