Index: tools/lldb-mi/MICmdArgValString.cpp
===================================================================
--- tools/lldb-mi/MICmdArgValString.cpp	(revision 215096)
+++ tools/lldb-mi/MICmdArgValString.cpp	(working copy)
@@ -64,11 +64,12 @@
 // Return:	None.
 // Throws:	None.
 //--
-CMICmdArgValString::CMICmdArgValString( const CMIUtilString & vrArgName, const bool vbMandatory, const bool vbHandleByCmd, const bool vbHandleQuotes /* = false */, const bool vbAcceptNumbers  /* = false */ )
+CMICmdArgValString::CMICmdArgValString( const CMIUtilString & vrArgName, const bool vbMandatory, const bool vbHandleByCmd,
+		const bool vbHandleQuotes /* = false */, const bool vbAcceptNumbers  /* = false */, const bool vbHandleDirPaths /* = false */ )
 :	CMICmdArgValBaseTemplate( vrArgName, vbMandatory, vbHandleByCmd )
 ,	m_bHandleQuotedString( vbHandleQuotes )
 ,	m_bAcceptNumbers( vbAcceptNumbers )
-,	m_bHandleDirPaths( false )
+,	m_bHandleDirPaths( vbHandleDirPaths )
 {
 }
 
Index: tools/lldb-mi/MICmdArgValString.h
===================================================================
--- tools/lldb-mi/MICmdArgValString.h	(revision 215096)
+++ tools/lldb-mi/MICmdArgValString.h	(working copy)
@@ -44,7 +44,8 @@
 public:
 	/* ctor */	CMICmdArgValString( void );
 	/* ctor */	CMICmdArgValString( const bool vbHandleQuotes, const bool vbAcceptNumbers, const bool vbHandleDirPaths );
-	/* ctor */	CMICmdArgValString( const CMIUtilString & vrArgName, const bool vbMandatory, const bool vbHandleByCmd, const bool vbHandleQuotes = false, const bool vbAcceptNumbers = false );
+	/* ctor */	CMICmdArgValString( const CMIUtilString & vrArgName, const bool vbMandatory, const bool vbHandleByCmd,
+			const bool vbHandleQuotes = false, const bool vbAcceptNumbers = false, const bool vbHandleDirPaths = false );
 	//
 	bool	IsStringArg( const CMIUtilString & vrTxt ) const;
 
Index: tools/lldb-mi/MICmdCmdBreak.cpp
===================================================================
--- tools/lldb-mi/MICmdCmdBreak.cpp	(revision 215096)
+++ tools/lldb-mi/MICmdCmdBreak.cpp	(working copy)
@@ -102,14 +102,15 @@
 {
 	bool bOk = m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedTempBrkPt, false, true )) );
 	//Not implemented bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedHWBrkPt, false, false ) ) );
-	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedPendinfBrkPt, false, true, CMICmdArgValListBase::eArgValType_String, 1 ) ) );
+	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedPendinfBrkPt, false, true  ) ) );
 	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedDisableBrkPt, false, false ) ) );
 	//Not implemented bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedTracePt, false, false ) ) );
 	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedConditionalBrkPt, false, true, CMICmdArgValListBase::eArgValType_StringQuoted, 1 ) ) );
 	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedInoreCnt, false, true, CMICmdArgValListBase::eArgValType_Number, 1 ) ) );
 	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionShort( m_constStrArgNamedRestrictBrkPtToThreadId, false, true, CMICmdArgValListBase::eArgValType_Number, 1 ) ) );
-	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValString( m_constStrArgNamedLocation, false, true ) ) );
-	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionLong( m_constStrArgNamedThreadGroup, false, true, CMICmdArgValListBase::eArgValType_ThreadGrp, 1 ) ) ); 
+	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValString( m_constStrArgNamedLocation, false, true, false, false, true ) ) );
+	bOk = bOk && m_setCmdArgs.Add( *(new CMICmdArgValOptionLong( m_constStrArgNamedThreadGroup, false, true, CMICmdArgValListBase::eArgValType_ThreadGrp, 1 ) ) );
+
 	CMICmdArgContext argCntxt( m_cmdData.strMiCmdOption );
 	if( bOk && !m_setCmdArgs.Validate( m_cmdData.strMiCmd, argCntxt ) )
 	{