diff options
| -rw-r--r-- | cppuhelper/source/bootstrap.cxx | 60 | ||||
| -rw-r--r-- | stoc/source/simpleregistry/simpleregistry.cxx | 98 | ||||
| -rw-r--r-- | stoc/source/simpleregistry/textualservices.cxx | 11 | ||||
| -rw-r--r-- | stoc/source/simpleregistry/textualservices.hxx | 3 |
4 files changed, 146 insertions, 26 deletions
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx index 7d8ef9c6269f..7ead58572f52 100644 --- a/cppuhelper/source/bootstrap.cxx +++ b/cppuhelper/source/bootstrap.cxx @@ -263,16 +263,17 @@ Reference< registry::XSimpleRegistry > readRdbDirectory( url), css::uno::Reference< css::uno::XInterface >()); } - for (css::uno::Reference< css::registry::XSimpleRegistry > last( - lastRegistry);;) + std::vector<rtl::OUString> aURLs; + css::uno::Reference< css::registry::XSimpleRegistry > last(lastRegistry); + for (;;) { osl::DirectoryItem i; - switch (dir.getNextItem(i, SAL_MAX_UINT32)) { - case osl::FileBase::E_None: + osl::FileBase::RC eResult; + eResult = dir.getNextItem(i, SAL_MAX_UINT32); + if (eResult == osl::FileBase::E_NOENT) break; - case osl::FileBase::E_NOENT: - return last; - default: + if (eResult != osl::FileBase::E_None) + { throw css::uno::RuntimeException( (rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("cannot iterate directory ")) + @@ -296,12 +297,49 @@ Reference< registry::XSimpleRegistry > readRdbDirectory( if (aName.toChar() == '.' || aName.endsWithAsciiL("~", 1)) continue; - if (stat.getFileType() != osl::FileStatus::Directory) { //TODO: symlinks - last = readRdbFile( - stat.getFileURL(), fatalErrors, last, simpleRegistryFactory, - nestedRegistryFactory); + if (stat.getFileType() != osl::FileStatus::Directory) //TODO: symlinks + aURLs.push_back(stat.getFileURL()); + } + + size_t nXML = 0; + for (std::vector<rtl::OUString>::iterator it = aURLs.begin(); it != aURLs.end(); it++) + { + // Read / sniff the nasty files ... + osl::File aIn( *it ); + if (aIn.open(osl_File_OpenFlag_Read) != osl::FileBase::E_None) + continue; + + sal_uInt64 nRead = 0; + char buffer[6]; + bool bIsXML = aIn.read(buffer, 6, nRead) == osl::FileBase::E_None && + nRead == 6 && !strncmp(buffer, "<?xml ", 6); + aIn.close(); + if (!bIsXML) + { + OSL_TRACE (OSL_LOG_PREFIX "rdb '%s' is a legacy format\n", + rtl::OUStringToOString( *it, RTL_TEXTENCODING_UTF8 ).getStr()); + break; + } + nXML++; + } + if (nXML == aURLs.size()) + { + OSL_TRACE (OSL_LOG_PREFIX "no legacy rdbs in directory '%s'\n", + rtl::OUStringToOString( url, RTL_TEXTENCODING_UTF8 ).getStr()); + // read whole directory... + last = readRdbFile( url, fatalErrors, last, + simpleRegistryFactory, nestedRegistryFactory); + } + else + { + for (std::vector<rtl::OUString>::iterator it = aURLs.begin(); it != aURLs.end(); it++) + { + // Read / sniff the nasty files ... + last = readRdbFile(*it, fatalErrors, last, + simpleRegistryFactory, nestedRegistryFactory); } } + return last; } Reference< registry::XSimpleRegistry > nestRegistries( diff --git a/stoc/source/simpleregistry/simpleregistry.cxx b/stoc/source/simpleregistry/simpleregistry.cxx index 085b73a22c3b..1c1e983101ad 100644 --- a/stoc/source/simpleregistry/simpleregistry.cxx +++ b/stoc/source/simpleregistry/simpleregistry.cxx @@ -48,6 +48,7 @@ #include "cppuhelper/implbase2.hxx" #include "cppuhelper/weak.hxx" #include "osl/mutex.hxx" +#include "osl/file.hxx" #include "registry/registry.hxx" #include "registry/regtype.h" #include "rtl/ref.hxx" @@ -84,6 +85,12 @@ public: private: virtual rtl::OUString SAL_CALL getURL() throw (css::uno::RuntimeException); + virtual void SAL_CALL openRdb( + rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) + throw ( + css::registry::InvalidRegistryException, + css::uno::RuntimeException); + virtual void SAL_CALL open( rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) throw ( @@ -1135,22 +1142,11 @@ rtl::OUString SimpleRegistry::getURL() throw (css::uno::RuntimeException) { return textual_.get() == 0 ? registry_.getName() : textual_->getUri(); } -void SimpleRegistry::open( +void SimpleRegistry::openRdb( rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) { osl::MutexGuard guard(mutex_); - if (textual_.get() != 0) { - throw css::registry::InvalidRegistryException( - (rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.registry.SimpleRegistry.open(")) + - rURL + - rtl::OUString( - RTL_CONSTASCII_USTRINGPARAM( - "): instance already open"))), - static_cast< OWeakObject * >(this)); - } RegError err = (rURL.getLength() == 0 && bCreate) ? REG_REGISTRY_NOT_EXISTS : registry_.open(rURL, bReadOnly ? REG_READONLY : REG_READWRITE); @@ -1162,7 +1158,10 @@ void SimpleRegistry::open( break; case REG_INVALID_REGISTRY: if (bReadOnly && !bCreate) { - textual_.reset(new stoc::simpleregistry::TextualServices(rURL)); + if (!textual_.get()) + textual_.reset(new stoc::simpleregistry::TextualServices(rURL)); + else + textual_->merge(rURL); break; } // fall through @@ -1180,6 +1179,79 @@ void SimpleRegistry::open( } } +void SimpleRegistry::open( + rtl::OUString const & rURL, sal_Bool bReadOnly, sal_Bool bCreate) + throw (css::registry::InvalidRegistryException, css::uno::RuntimeException) +{ + osl::MutexGuard guard(mutex_); + + osl::DirectoryItem aItem; + osl::FileBase::RC eErr; + osl::FileStatus aStatus(osl_FileStatus_Mask_Type); + + // FIXME: busts the 'create' mode ... + if ((eErr = osl::DirectoryItem::get( rURL, aItem )) != osl::FileBase::E_None || + (eErr = aItem.getFileStatus( aStatus )) != osl::FileBase::E_None || + aStatus.getFileType() != osl::FileStatus::Directory) + { + if (textual_.get() != 0) + throw css::registry::InvalidRegistryException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.registry.SimpleRegistry.open(")) + + rURL + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM("): instance already open"))), + static_cast< OWeakObject * >(this)); + openRdb (rURL, bReadOnly, bCreate); + } + else + { + osl::Directory dir(rURL); + eErr = dir.open(); + if (eErr != osl::FileBase::E_None) + goto err_throw; + + for (;;) { + osl::DirectoryItem i; + if (dir.getNextItem(i, SAL_MAX_UINT32) != osl::FileBase::E_None) + break; + osl::FileStatus stat(osl_FileStatus_Mask_Type | osl_FileStatus_Mask_FileName | + osl_FileStatus_Mask_FileURL); + if (i.getFileStatus(stat) != osl::FileBase::E_None) + throw css::uno::RuntimeException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "cannot stat in directory ")) + + rURL), + css::uno::Reference< css::uno::XInterface >()); + + rtl::OUString aName = stat.getFileName(); + + // Ignore backup files - to allow people to edit their + // services/ without extremely confusing behaviour + if (aName.toChar() == '.' || aName.endsWithAsciiL("~", 1)) + continue; + + if (stat.getFileType() != osl::FileStatus::Directory) + openRdb(stat.getFileURL(), bReadOnly, bCreate); + } + } + return; + +err_throw: + throw css::registry::InvalidRegistryException( + (rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "com.sun.star.registry.SimpleRegistry.open(")) + + rURL + + rtl::OUString( + RTL_CONSTASCII_USTRINGPARAM( + "): error statting url = ")) + + rtl::OUString::valueOf(static_cast< sal_Int32 >(eErr))), + static_cast< OWeakObject * >(this)); +} + sal_Bool SimpleRegistry::isValid() throw (css::uno::RuntimeException) { osl::MutexGuard guard(mutex_); return textual_.get() != 0 || registry_.isValid(); diff --git a/stoc/source/simpleregistry/textualservices.cxx b/stoc/source/simpleregistry/textualservices.cxx index 0b6f672342f8..2ab12d47ee92 100644 --- a/stoc/source/simpleregistry/textualservices.cxx +++ b/stoc/source/simpleregistry/textualservices.cxx @@ -1234,6 +1234,15 @@ css::uno::Sequence< rtl::OUString > Key::getChildren() { TextualServices::TextualServices(rtl::OUString const & uri): uri_(uri), data_(new Data) { + merge(uri); +} + +TextualServices::~TextualServices() {} + +// load and merge registry contents from uri +void TextualServices::merge(const rtl::OUString &uri) + throw (com::sun::star::registry::InvalidRegistryException) +{ try { Parser(uri, data_); } catch (css::container::NoSuchElementException &) { @@ -1245,8 +1254,6 @@ TextualServices::TextualServices(rtl::OUString const & uri): } } -TextualServices::~TextualServices() {} - css::uno::Reference< css::registry::XRegistryKey > TextualServices::getRootKey() { return new Key(data_, std::vector< rtl::OUString >()); diff --git a/stoc/source/simpleregistry/textualservices.hxx b/stoc/source/simpleregistry/textualservices.hxx index 286eb922a1b4..0341c15d5d34 100644 --- a/stoc/source/simpleregistry/textualservices.hxx +++ b/stoc/source/simpleregistry/textualservices.hxx @@ -53,6 +53,9 @@ public: virtual ~TextualServices(); + void merge(const rtl::OUString &uri) + throw (com::sun::star::registry::InvalidRegistryException); + inline rtl::OUString getUri() { return uri_; } com::sun::star::uno::Reference< com::sun::star::registry::XRegistryKey > |