diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2017-03-06 16:09:54 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2017-03-09 11:21:40 +0000 |
commit | 099f9406b6657a03a37fbe5cedf7cb7da765d4aa (patch) | |
tree | 799f0a3a47cbad0362e35a032ec8f1cc3842c46c /desktop | |
parent | 9e4f6531bf0ae8b375127a189e87c1ebc99508ac (diff) |
tdf#106359: Open Web Query (.iqy) files
As per http://support.microsoft.com/kb/157482, the files are plain-text
files with an URL and optional GET and POST parameters (static and
dynamic).
This commit introduces basic support to open these files
(without support for POST and dynamic parameters).
Change-Id: Ic122efdcfacb8b5de3ef68be1cf0e8a480710eca
Reviewed-on: https://gerrit.libreoffice.org/34928
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop')
-rw-r--r-- | desktop/CppunitTest_desktop_app.mk | 1 | ||||
-rw-r--r-- | desktop/source/app/cmdlineargs.cxx | 90 |
2 files changed, 90 insertions, 1 deletions
diff --git a/desktop/CppunitTest_desktop_app.mk b/desktop/CppunitTest_desktop_app.mk index 6189f05c12a5..b809b6a7e8c6 100644 --- a/desktop/CppunitTest_desktop_app.mk +++ b/desktop/CppunitTest_desktop_app.mk @@ -41,6 +41,7 @@ $(eval $(call gb_CppunitTest_use_libraries,desktop_app, \ tk \ tl \ $(if $(ENABLE_TELEPATHY),tubes) \ + ucbhelper \ utl \ vcl \ )) diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index 003136989406..938bff6d004d 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -37,7 +37,9 @@ #include <svl/documentlockfile.hxx> -#include <cstdio> +#include <ucbhelper/content.hxx> +#include <rtl/strbuf.hxx> +#include <osl/file.hxx> using namespace com::sun::star::lang; using namespace com::sun::star::uri; @@ -166,6 +168,89 @@ CommandLineEvent CheckOfficeURI(/* in,out */ OUString& arg, CommandLineEvent cur return curEvt; } +// Skip single newline (be it *NIX LF, MacOS CR, of Win CRLF) +// Changes the offset, and returns true if moved +bool SkipNewline(const char* pStr, sal_Int32& rOffset) +{ + if ((pStr[rOffset] != '\r') && (pStr[rOffset] != '\n')) + return false; + if (pStr[rOffset] == '\r') + ++rOffset; + if (pStr[rOffset] == '\n') + ++rOffset; + return true; +} + +// Web query: http://support.microsoft.com/kb/157482 +CommandLineEvent CheckWebQuery(/* in,out */ OUString& arg, CommandLineEvent curEvt) +{ + // Only handle files with extension .iqy + if (!arg.endsWithIgnoreAsciiCase(".iqy")) + return curEvt; + + static osl::Mutex aMutex; + osl::MutexGuard aGuard(aMutex); + + try + { + OUString sFileURL; + if (osl::FileBase::getFileURLFromSystemPath(arg, sFileURL) != osl::FileBase::RC::E_None) + return curEvt; + css::uno::Reference < css::ucb::XCommandEnvironment > xEnv; + ucbhelper::Content aSourceContent(sFileURL, xEnv, comphelper::getProcessComponentContext()); + + // the file can be opened readonly, no locking will be done + css::uno::Reference< css::io::XInputStream > xInput = aSourceContent.openStream(); + if (!xInput.is()) + return curEvt; + + const sal_Int32 nBufLen = 32000; + css::uno::Sequence< sal_Int8 > aBuffer(nBufLen); + sal_Int32 nRead = xInput->readBytes(aBuffer, nBufLen); + if (nRead < 8) // WEB\n1\n... + return curEvt; + + const char* sBuf = reinterpret_cast<const char*>(aBuffer.getConstArray()); + sal_Int32 nOffset = 0; + if (strncmp(sBuf+nOffset, "WEB", 3) != 0) + return curEvt; + nOffset += 3; + if (!SkipNewline(sBuf, nOffset)) + return curEvt; + if (sBuf[nOffset] != '1') + return curEvt; + ++nOffset; + if (!SkipNewline(sBuf, nOffset)) + return curEvt; + + rtl::OStringBuffer aResult(nRead); + do + { + // xInput->readBytes() can relocate buffer + sBuf = reinterpret_cast<const char*>(aBuffer.getConstArray()); + const char* sPos = sBuf + nOffset; + const char* sPos1 = sPos; + const char* sEnd = sBuf + nRead; + while ((sPos1 < sEnd) && (*sPos1 != '\r') && (*sPos1 != '\n')) + ++sPos1; + aResult.append(sPos, sPos1 - sPos); + if (sPos1 < sEnd) // newline + break; + nOffset = 0; + } while ((nRead = xInput->readBytes(aBuffer, nBufLen)) > 0); + + xInput->closeInput(); + + arg = OUString::createFromAscii(aResult.getStr()); + } + catch (...) + { + SAL_WARN("desktop.app", "An error processing Web Query file: " << arg); + } + + return curEvt; +} + } // namespace CommandLineArgs::Supplier::Exception::Exception() {} @@ -530,6 +615,9 @@ void CommandLineArgs::ParseCommandLine_Impl( Supplier& supplier ) // and put real URI to aArg CommandLineEvent eThisEvent = CheckOfficeURI(aArg, eCurrentEvent); + // Now check if this is a Web Query file + eThisEvent = CheckWebQuery(aArg, eThisEvent); + switch (eThisEvent) { case CommandLineEvent::Open: |