Made extraction of BMDISKWRITESYNC independent of 4.6.

1 files changed, 17 insertions, 3 deletions

diff --git a/src/bmserver/main.cpp b/src/bmserver/main.cpp
index a558cd7..6575b30 100644
--- a/src/bmserver/main.cpp
+++ b/src/bmserver/main.cpp
@@ -144,11 +144,25 @@ static bool initDatabase(const QString &dbfile, QString *error)
     return true;
 }
 
-static void prepare(QSqlDatabase &db)
+static QString envValue(const QString &name)
 {
-    QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
+    QStringList sysenv = QProcess::systemEnvironment();
+    QRegExp rx;
+    int pos;
+    rx = QRegExp(QString("^%1=(\\S+)$").arg(name));
+    if ((pos = sysenv.indexOf(rx)) != -1) {
+        rx.indexIn(sysenv.at(pos));
+        return rx.cap(1);
+    }
+    return QString();
+
+// ### The body of this function could be simplified to this in 4.6:
+//    return QProcessEnvironment::systemEnvironment().value(name);
+}
 
-    if (sysenv.value("BMDISKWRITESYNC") == "off") {
+static void prepare(QSqlDatabase &db)
+{
+    if (envValue("BMDISKWRITESYNC") == "off") {
         // Disable synchrounous disk writes ...
         QSqlQuery query(db);
         bool ok;