[asterisk-commits] qwell: trunk r44054 - in /trunk: ./ main/asterisk.c main/cli.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Fri Sep 29 17:36:29 2006
New Revision: 44054

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

........
r44053 | qwell | 2006-09-29 15:35:09 -0700 (Fri, 29 Sep 2006) | 3 lines

Fix a bug with the removal of 'atleast' argument to 'core verbose' and 'core debug'.
Add that argument back in.

........

Modified:
    trunk/   (props changed)
    trunk/main/asterisk.c
    trunk/main/cli.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?rev=44054&r1=44053&r2=44054&view=diff
==============================================================================
--- trunk/main/asterisk.c (original)
+++ trunk/main/asterisk.c Fri Sep 29 17:36:29 2006
@@ -2074,9 +2074,9 @@
 		pid = atoi(cpid);
 	else
 		pid = -1;
-	snprintf(tmp, sizeof(tmp), "core verbose %d", option_verbose);
+	snprintf(tmp, sizeof(tmp), "core verbose atleast %d", option_verbose);
 	fdprint(ast_consock, tmp);
-	snprintf(tmp, sizeof(tmp), "core debug %d", option_debug);
+	snprintf(tmp, sizeof(tmp), "core debug atleast %d", option_debug);
 	fdprint(ast_consock, tmp);
 	if (ast_opt_mute) {
 		snprintf(tmp, sizeof(tmp), "log and verbose output currently muted ('logger unmute' to unmute)");

Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?rev=44054&r1=44053&r2=44054&view=diff
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Fri Sep 29 17:36:29 2006
@@ -175,12 +175,28 @@
 static int handle_verbose(int fd, int argc, char *argv[])
 {
 	int oldval = option_verbose;
-
-	if (argc == 3)
+	int newlevel;
+	int atleast = 0;
+
+	if ((argc < 3) || (argc > 4))
+		return RESULT_SHOWUSAGE;
+
+	if (!strcasecmp(argv[2], "atleast"))
+		atleast = 1;
+
+	if (!atleast) {
+		if (argc > 3)
+			return RESULT_SHOWUSAGE;
+
 		option_verbose = atoi(argv[2]);
-	else
-		return RESULT_SHOWUSAGE;
-
+	} else {
+		if (argc < 4)
+			return RESULT_SHOWUSAGE;
+
+		newlevel = atoi(argv[3]);
+		if (newlevel > option_verbose)
+			option_verbose = newlevel;
+        }
 	if (oldval > 0 && option_verbose == 0)
 		ast_cli(fd, "Verbosity is now OFF\n");
 	else if (option_verbose > 0) {
@@ -197,21 +213,46 @@
 {
 	int oldval = option_debug;
 	int newlevel;
+	int atleast = 0;
 	char *filename = '\0';
 
-	if ((argc < 3) || (argc > 4))
-		return RESULT_SHOWUSAGE;
-
-	if (sscanf(argv[2], "%d", &newlevel) != 1)
-		return RESULT_SHOWUSAGE;
-
-	option_debug = newlevel;
-
-	if (argc == 4) {
-		filename = argv[3];
-		ast_copy_string(debug_filename, filename, sizeof(debug_filename));
+	if ((argc < 3) || (argc > 5))
+		return RESULT_SHOWUSAGE;
+
+	if (!strcasecmp(argv[2], "atleast"))
+		atleast = 1;
+
+	if (!atleast) {
+		if (argc > 4)
+			return RESULT_SHOWUSAGE;
+
+		if (sscanf(argv[2], "%d", &newlevel) != 1)
+			return RESULT_SHOWUSAGE;
+
+		if (argc == 3) {
+			debug_filename[0] = '\0';
+		} else {
+			filename = argv[3];
+			ast_copy_string(debug_filename, filename, sizeof(debug_filename));
+		}
+
+		option_debug = newlevel;
 	} else {
-		debug_filename[0] = '\0';
+		if (argc < 4)
+			return RESULT_SHOWUSAGE;
+
+		if (sscanf(argv[3], "%d", &newlevel) != 1)
+			return RESULT_SHOWUSAGE;
+
+		if (argc == 4) {
+			debug_filename[0] = '\0';
+		} else {
+			filename = argv[4];
+			ast_copy_string(debug_filename, filename, sizeof(debug_filename));
+		}
+
+		if (newlevel > option_debug)
+			option_debug = newlevel;
 	}
 
 	if (oldval > 0 && option_debug == 0)