[Opalvoip-svn] SF.net SVN: opalvoip:[34914] ptlib/trunk

[<rjo...@us...>]

Revision: 34914
          http://sourceforge.net/p/opalvoip/code/34914
Author:   rjongbloed
Date:     2016-08-12 15:50:03 +0000 (Fri, 12 Aug 2016)
Log Message:
-----------
Merged revision(s) 34901-34913 from ptlib/branches/v2_16:
Fixed !! command in Command Line Interpreter.

Modified Paths:
--------------
    ptlib/trunk/src/ptclib/cli.cxx

Property Changed:
----------------
    ptlib/trunk/

Index: ptlib/trunk
===================================================================
--- ptlib/trunk	2016-08-12 15:48:36 UTC (rev 34913)
+++ ptlib/trunk	2016-08-12 15:50:03 UTC (rev 34914)

Property changes on: ptlib/trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -6,7 +6,7 ##
 /ptlib/branches/v2_10:25177-29189,32921,32947
 /ptlib/branches/v2_12:28485-31603
 /ptlib/branches/v2_14:31501-33720
-/ptlib/branches/v2_16:34085-34900
+/ptlib/branches/v2_16:34085-34913
 /ptlib/branches/v2_2:20746,20791,20827,22014,22942
 /ptlib/branches/v2_4:21086,21094,21147,21160,21185,21281,21296,21305,21322,21337,21363,21467,21471-21472,21506,21508,21623,21695,21744,21746,21763,22241,22958,23045-23046,23061,23066,23712
 /ptlib/branches/v2_6:22195,22243,22295,22304,22311,22317,22320,22356,22458,22509,22587,22601-22602,22611,22629,22633,22673,22681,22729,22731-22732,22736,22742,22848,22960,22992,23161,23163,23167,23169,23177,23239,23291,23298,23336,23429,23595,23823,23827,23873,24816
\ No newline at end of property
Modified: ptlib/trunk/src/ptclib/cli.cxx
===================================================================
--- ptlib/trunk/src/ptclib/cli.cxx	2016-08-12 15:48:36 UTC (rev 34913)
+++ ptlib/trunk/src/ptclib/cli.cxx	2016-08-12 15:50:03 UTC (rev 34914)
@@ -466,6 +466,8 @@
     line = m_commandHistory[cmdNum-1];
   }
 
+  m_commandHistory += line;
+
   if (CheckInternalCommand(line, m_cli.GetHelpCommand()))
     m_cli.ShowHelp(*this, line);
   else {
@@ -474,8 +476,6 @@
     m_cli.OnReceivedLine(args);
     m_state = e_CommandEntry;
   }
-
-  m_commandHistory += line;
 }
 
 
@@ -554,7 +554,7 @@
                  "\n"
                  "Commands available are:")
   , m_repeatCommand("!!")
-  , m_historyCommand("!")
+  , m_historyCommand("!\nhistory")
   , m_noHistoryError("No command history")
   , m_commandUsagePrefix("Usage: ")
   , m_commandErrorPrefix(": error: ")

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.