[svn-commits] russell: trunk r47367 - in /trunk: ./ main/cli.c

[svn-commits at lists.digium.com]

Author: russell
Date: Thu Nov  9 09:51:15 2006
New Revision: 47367

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47367
Log:
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)

........

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

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

Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?view=diff&rev=47367&r1=47366&r2=47367
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Thu Nov  9 09:51:15 2006
@@ -405,9 +405,9 @@
 {
 	/* 'show uptime [seconds]' */
 	time_t curtime = time(NULL);
-	int printsec = (argc == 3 && !strcasecmp(argv[2],"seconds"));
-
-	if (argc != 2 && !printsec)
+	int printsec = (argc == 4 && !strcasecmp(argv[3],"seconds"));
+
+	if (argc != 3 && !printsec)
 		return RESULT_SHOWUSAGE;
 	if (ast_startuptime)
 		print_uptimestr(fd, curtime - ast_startuptime, "System uptime", printsec);