diff options
| author | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:27:49 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2007-01-23 11:27:49 +0000 |
| commit | 2bb8b24220efd2bd112236e913c0b83c94ee4a9c (patch) | |
| tree | 09773db64b51b72bd8794985f9d1245dab4483bb /shell/source/unix/exec | |
| parent | 1b01ad9adbc4a564d6a6101e26838df829b3d78f (diff) | |
INTEGRATION: CWS obr04 (1.15.28); FILE MERGED
2007/01/11 09:42:38 obr 1.15.28.2: #i72543# compile fixes + bug in test app
2007/01/10 15:02:15 obr 1.15.28.1: #i72543# correctly encode what gets passed to the shell via popen + add unit test
Diffstat (limited to 'shell/source/unix/exec')
| -rw-r--r-- | shell/source/unix/exec/shellexec.cxx | 38 |
1 files changed, 23 insertions, 15 deletions
diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index 145f93857f19..124aed3aed2a 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -4,9 +4,9 @@ * * $RCSfile: shellexec.cxx,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: obo $ $Date: 2006-09-17 01:41:54 $ + * last change: $Author: obo $ $Date: 2007-01-23 12:27:49 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,10 +52,6 @@ #include <osl/file.hxx> #endif -#ifndef _RTL_STRBUF_HXX_ -#include <rtl/strbuf.hxx> -#endif - #ifndef _RTL_USTRBUF_HXX_ #include <rtl/ustrbuf.hxx> #endif @@ -124,6 +120,20 @@ namespace // private } } +void escapeForShell( rtl::OStringBuffer & rBuffer, const rtl::OString & rURL) +{ + sal_Int32 nmax = rURL.getLength(); + for(sal_Int32 n=0; n < nmax; ++n) + { + // escape every non alpha numeric characters (excluding a few "known good") by prepending a '\' + sal_Char c = rURL[n]; + if( ( c < 'A' || c > 'Z' ) && ( c < 'a' || c > 'z' ) && ( c < '0' || c > '9' ) && c != '/' && c != '.' ) + rBuffer.append( '\\' ); + + rBuffer.append( c ); + } +} + //----------------------------------------------------------------------------------------- // //----------------------------------------------------------------------------------------- @@ -208,7 +218,7 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding()); nIndex = aTmp.lastIndexOf('/'); if (nIndex > 0) - aBuffer.append(aTmp.copy(0, nIndex+1)); + escapeForShell(aBuffer, aTmp.copy(0, nIndex+1)); // Respect the desktop environment - if there is an executable named // <desktop-environement-is>-open-url, pass the url to this one instead @@ -236,21 +246,19 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar aBuffer.append("open-url"); #endif - aBuffer.append(" \'"); - aBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding())); - aBuffer.append("\'"); + aBuffer.append(" "); + escapeForShell(aBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding())); if ( pDesktopLaunch && *pDesktopLaunch ) { aLaunchBuffer.append( pDesktopLaunch ); - aLaunchBuffer.append( " \'" ); - aLaunchBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding())); - aLaunchBuffer.append( "\'" ); + aLaunchBuffer.append(" "); + escapeForShell(aLaunchBuffer, OUStringToOString(aURL, osl_getThreadTextEncoding())); } } else { - aBuffer.append(OUStringToOString(aCommand, osl_getThreadTextEncoding())); + escapeForShell(aBuffer, OUStringToOString(aCommand, osl_getThreadTextEncoding())); aBuffer.append(" "); - aBuffer.append(OUStringToOString(aParameter, osl_getThreadTextEncoding())); + escapeForShell(aBuffer, OUStringToOString(aParameter, osl_getThreadTextEncoding())); } // Prefer DESKTOP_LAUNCH when available |