[Asterisk-cvs] asterisk/pbx pbx_config.c,1.44,1.45

[markster at lists.digium.com]

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

Modified Files:
	pbx_config.c 
Log Message:
Make menu interruptible (bug #2377), Also fix PBX "add extension" CLI (bug #2289)


Index: pbx_config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- pbx_config.c	21 Aug 2004 18:55:39 -0000	1.44
+++ pbx_config.c	7 Sep 2004 01:22:57 -0000	1.45
@@ -1195,13 +1195,21 @@
 			}
 		}
 	}
-	app = strsep(&whole_exten, ",");
+	app = whole_exten;
 	if (app && (start = strchr(app, '(')) && (end = strrchr(app, ')'))) {
 		*start = *end = '\0';
 		app_data = start + 1;
 		process_quotes_and_slashes(app_data, ',', '|');
-	} else
-		app_data = whole_exten;
+	} else {
+		if (app) {
+			app_data = strchr(app, ',');
+			if (app_data) {
+				*app_data = '\0';
+				app_data++;
+			}
+		} else	
+			app_data = NULL;
+	}
 
 	if (!exten || !prior || !app || (!app_data && iprior != PRIORITY_HINT)) return RESULT_SHOWUSAGE;