diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-17 17:59:00 +0000 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 18:08:34 +0100 |
| commit | b319eb379893098f895eaffb4a16369cf0c018b6 (patch) | |
| tree | 547c6fc2e751c43a51035641e8bd12c07795ba74 /rsc | |
| parent | f5d4c546de238d47eb5b10f13a8ed03c03f96e29 (diff) | |
be more paranoid about eliding empty path params we get
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index a4d9386126bb..a498f5485f42 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -231,14 +231,18 @@ RscCmdLine::RscCmdLine( int argc, char ** argv, RscError * pEH ) else if( !rsc_strnicmp( (*ppStr) + 1, "lip=", 4 ) ) { // additional language specific include for system dependent files const ByteString aSysSearchDir( (*ppStr)+5 ); - DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) ); - m_aOutputFiles.back().aSysSearchDirs.push_back( ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ); - - if( m_aOutputFiles.back().aLangSearchPath.Len() ) - m_aOutputFiles.back().aLangSearchPath.Append( ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) ); - - m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir ); + // ignore empty -lip= arguments that we get lots of these days + if (aSysSearchDir.Len()) + { + DirEntry aSysDir( String( aSysSearchDir, RTL_TEXTENCODING_ASCII_US ) ); + m_aOutputFiles.back().aSysSearchDirs.push_back( + ByteString( aSysDir.GetFull(), RTL_TEXTENCODING_ASCII_US ) ); + if( m_aOutputFiles.back().aLangSearchPath.Len() ) + m_aOutputFiles.back().aLangSearchPath.Append( + ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US ) ); + m_aOutputFiles.back().aLangSearchPath.Append( aSysSearchDir ); + } } else if( !rsc_strnicmp( (*ppStr) + 1, "fp=", 3 ) ) { // anderer Name fuer .srs-file |