From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 9 Nov 2006 15:51:15 +0000 (+0000)
Subject: Merged revisions 47366 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4065
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3c0a35b6eaa59bfc05777f3e4ec903ba3f31a89;p=thirdparty%2Fasterisk.git

Merged revisions 47366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r47366 | russell | 2006-11-09 10:49:39 -0500 (Thu, 09 Nov 2006) | 3 lines

Fix another CLI command, "core show uptime" ...
(issue #8323, reported by johnlange, fixed by myself)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@47367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/cli.c b/main/cli.c
index 2c5f747aff..40f506c2a8 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -405,9 +405,9 @@ static int handle_showuptime(int fd, int argc, char *argv[])
 {
 	/* 'show uptime [seconds]' */
 	time_t curtime = time(NULL);
-	int printsec = (argc == 3 && !strcasecmp(argv[2],"seconds"));
+	int printsec = (argc == 4 && !strcasecmp(argv[3],"seconds"));
 
-	if (argc != 2 && !printsec)
+	if (argc != 3 && !printsec)
 		return RESULT_SHOWUSAGE;
 	if (ast_startuptime)
 		print_uptimestr(fd, curtime - ast_startuptime, "System uptime", printsec);