[svn-commits] file: trunk r56784 - in /trunk: ./ main/asterisk.c

[svn-commits at lists.digium.com]

Author: file
Date: Mon Feb 26 10:38:10 2007
New Revision: 56784

URL: http://svn.digium.com/view/asterisk?view=rev&rev=56784
Log:
Merged revisions 56783 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r56783 | file | 2007-02-26 11:36:08 -0500 (Mon, 26 Feb 2007) | 2 lines

Allow both of the show version files and core show file versions CLI commands to work. (issue #9135 reported by mvanbaak)

........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/main/asterisk.c?view=diff&rev=56784&r1=56783&r2=56784
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Mon Feb 26 10:38:10 2007
@@ -564,18 +564,18 @@
 	int count_files = 0;
 
 	switch (argc) {
-	case 5:
-		if (!strcasecmp(argv[3], "like")) {
-			if (regcomp(&regexbuf, argv[4], REG_EXTENDED | REG_NOSUB))
+	case 6:
+		if (!strcasecmp(argv[4], "like")) {
+			if (regcomp(&regexbuf, argv[5], REG_EXTENDED | REG_NOSUB))
 				return RESULT_SHOWUSAGE;
 			havepattern = 1;
 		} else
 			return RESULT_SHOWUSAGE;
 		break;
-	case 4:
+	case 5:
 		havename = 1;
 		break;
-	case 3:
+	case 4:
 		break;
 	default:
 		return RESULT_SHOWUSAGE;
@@ -585,7 +585,7 @@
 	ast_cli(fd, FORMAT, "----", "--------");
 	AST_LIST_LOCK(&file_versions);
 	AST_LIST_TRAVERSE(&file_versions, iterator, list) {
-		if (havename && strcasecmp(iterator->file, argv[3]))
+		if (havename && strcasecmp(iterator->file, argv[4]))
 			continue;
 
 		if (havepattern && regexec(&regexbuf, iterator->file, 0, NULL, 0))