[Opalvoip-svn] SF.net SVN: opalvoip:[32247] ptlib/trunk
Brought to you by:
csoutheren,
rjongbloed
From: <rjo...@us...> - 2014-06-27 07:27:29
|
Revision: 32247 http://sourceforge.net/p/opalvoip/code/32247 Author: rjongbloed Date: 2014-06-27 07:27:21 +0000 (Fri, 27 Jun 2014) Log Message: ----------- Merged revision(s) 32240-32246 from ptlib/branches/v2_14: Fixed argument parsing for single letter option with string. Modified Paths: -------------- ptlib/trunk/src/ptlib/common/osutils.cxx Property Changed: ---------------- ptlib/trunk/ Index: ptlib/trunk =================================================================== --- ptlib/trunk 2014-06-27 07:25:43 UTC (rev 32246) +++ ptlib/trunk 2014-06-27 07:27:21 UTC (rev 32247) Property changes on: ptlib/trunk ___________________________________________________________________ Modified: svn:mergeinfo ## -5,7 +5,7 ## /ptlib/branches/csoutheren/LalandeBranch1:23331-23333,23723 /ptlib/branches/v2_10:25177-29189 /ptlib/branches/v2_12:28485-31603 -/ptlib/branches/v2_14:31501-32239 +/ptlib/branches/v2_14:31501-32246 /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/ptlib/common/osutils.cxx =================================================================== --- ptlib/trunk/src/ptlib/common/osutils.cxx 2014-06-27 07:25:43 UTC (rev 32246) +++ ptlib/trunk/src/ptlib/common/osutils.cxx 2014-06-27 07:27:21 UTC (rev 32247) @@ -1675,7 +1675,7 @@ if (opt.m_type == OptionalString && (offset == P_MAX_INDEX || m_argumentArray[arg][offset] == '\0')) return 0; - if (offset != P_MAX_INDEX) { + if (offset != P_MAX_INDEX && m_argumentArray[arg][offset] != '\0') { opt.m_string += m_argumentArray[arg].Mid(offset); return 1; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |