Changeset 425 for trunk/src

Timestamp:

Dec 14, 2009, 9:16:37 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/io: QSettings: Use IniFormat (plain INI files) when NativeFormat is requested instead of the Open32 registry which is known to be unstable and can be easily corrupted. The old behavior may be restored using the QT_PM_REGISTRY environment variable (#111).

Location:

trunk/src/corelib/io

Files:

• qsettings.cpp (modified) (4 diffs)
• qsettings_os2.cpp (modified) (2 diffs)

trunk/src/corelib/io/qsettings.cpp

@@ -1136 +1136 @@
                          windowsConfigPath(CSIDL_COMMON_APPDATA) + QDir::separator());
 #elif defined(Q_OS_OS2)
-        /* Though this code is very similar to the following #else statment,
-         * we have to do it separately for OS/2 and leave the original code
-         * intact since QDir::separator() returns ":" on Mac OS X while "/" is
-         * actually used in the #else below. */
+        /* Though this code is very similar to the following #else block, the
+         * definition of the "absolute path" is different on OS/2 (see
+         * isRelativePath() in qfsfileengine_os2.cpp) so take it into account)*/
         QString userPath;
-        QString env = QLatin1String(getenv("XDG_CONFIG_HOME"));
+        QString env = QFile::decodeName(qgetenv("XDG_CONFIG_HOME"));
         if (env.isEmpty()) {
             userPath = homePath;
             userPath += QDir::separator();
             userPath += QLatin1String(".config");
-        } else if (QDir::isAbsolutePath(env)) {
-            userPath = env;
         } else {
-            userPath = homePath;
-            userPath += QDir::separator();
-            userPath += env;
-        }
-        userPath += QDir::separator();
+            userPath = QDir::cleanPath(QDir(homePath).absoluteFilePath(env));
+        }
+        userPath = QDir::cleanPath(userPath) + QLatin1Char('/');
 
         pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope), userPath);
@@ -2386 +2381 @@
     \o \c{%HOME%\.config\MySoft\Star Runner.ini}
     \o \c{%HOME%\.config\MySoft.ini}
-    \o \c{<boot_drv>:\OS2\xdg\MySoft\Star Runner.ini}
-    \o \c{<boot_drv>:\OS2\xdg\MySoft.ini}
+    \o \c{%ETC%\xdg\MySoft\Star Runner.ini}
+    \o \c{%ETC%\xdg\MySoft.ini}
     \endlist
 
@@ -3470 +3465 @@
     \row    \o{1,2} Mac OS X    \o{1,2} IniFormat               \o UserScope   \o \c $HOME/.config
     \row                                                        \o SystemScope \o \c /etc/xdg
-    \row    \o{1,2} OS/2        \o{1,2} IniFormat               \o UserScope   \o \c $HOME\.config
-    \row                                                        \o SystemScope \o \c <boot_drv>:\OS2\xdg
+    \row    \o{1,2} OS/2        \o{1,2} IniFormat               \o UserScope   \o \c %HOME%\.config
+    \row                                                        \o SystemScope \o \c %ETC%\xdg
     \endtable
 
@@ -3477 +3472 @@
     $HOME/Settings) can be overridden by the user by setting the
     \c XDG_CONFIG_HOME environment variable. The default SystemScope
-    paths on Unix, Mac OS X (\c /etc/xdg) and OS/2 (\c <boot_drv>:\OS2\xdg) can
-    be overridden when building the Qt library using the \c configure script's
+    paths on Unix, Mac OS X (\c /etc/xdg) and OS/2 (\c %ETC%\xdg) can be
+    overridden when building the Qt library using the \c configure script's
     \c
     --sysconfdir flag (see QLibraryInfo for details).

trunk/src/corelib/io/qsettings_os2.cpp

@@ -1070 +1070 @@
 }
 
+static QSettings::Format checkFormat(QSettings::Format format)
+{
+    if (getenv("QT_PM_NO_REGISTRY") != NULL ||
+        getenv("QT_PM_REGISTRY") == NULL) {
+#if defined(QT_DEBUG)
+        if (getenv("QT_PM_NO_REGISTRY") != NULL)
+            qDebug("QSettings: WARNING: using plain INI files due to QT_PM_NO_REGISTRY=%s",
+                    getenv("QT_PM_NO_REGISTRY"));
+#endif
+        if (format == QSettings::NativeFormat)
+            format = QSettings::IniFormat;
+    }
+#if defined(QT_DEBUG)
+    if (getenv("QT_PM_REGISTRY") != NULL)
+        qDebug("QSettings: WARNING: using Open32 registry due to QT_PM_REGISTRY=%s",
+                getenv("QT_PM_REGISTRY"));
+#endif
+
+    return format;
+}
+
 QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, QSettings::Scope scope,
                                            const QString &organization, const QString &application)
 {
+    format = checkFormat(format);
+
     if (format == QSettings::NativeFormat) {
         return new QOS2SettingsPrivate(scope, organization, application);
@@ -1082 +1105 @@
 QSettingsPrivate *QSettingsPrivate::create(const QString &fileName, QSettings::Format format)
 {
+    format = checkFormat(format);
+
     if (format == QSettings::NativeFormat) {
         return new QOS2SettingsPrivate(fileName);