strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Optimize a bit

Browse source 
Change-Id: Icccf4a93054780c7a111f664117b25821c47f700
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/169906
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski 2024-07-03 12:21:25 +05:00
parent 71b7313aa2
commit afa5ade8b5
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
shell/source/win32/SysShExec.cxx
View file

@ -308,15 +308,15 @@ void SAL_CALL CSysShExec::execute( const OUString& aCommand, const OUString& aPa
{}, 0);
}
}
pathname = o3tl::toU(path);
std::u16string_view resulting_path(o3tl::toU(path));
// ShellExecuteExW appears to ignore trailing dots, so remove them:
while (pathname.endsWith(".", &pathname)) {}
auto const n = pathname.lastIndexOf('.');
if (n > pathname.lastIndexOf('\\')) {
auto const ext = pathname.copy(n + 1);
if (!ext.isEmpty()) {
while (o3tl::ends_with(resulting_path, u".", &resulting_path)) {}
auto const n = resulting_path.find_last_of('.');
if (n != std::u16string_view::npos && n > resulting_path.find_last_of('\\')) {
auto const ext = resulting_path.substr(n + 1);
if (!ext.empty()) {
OUString env;
if (osl_getEnvironment(OUString("PATHEXT").pData, &env.pData)
if (osl_getEnvironment(u"PATHEXT"_ustr.pData, &env.pData)
!= osl_Process_E_None)
{
SAL_INFO("shell", "osl_getEnvironment(PATHEXT) failed");