Changeset 997

Timestamp:

Aug 17, 2011, 4:45:20 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

qmake: gnumake/os2: Quote paths with trailing separators.

This is to avoid interpreting the trailing back slash as a line break.

File:

• trunk/qmake/generators/os2/gnumake.cpp (modified) (2 diffs)

trunk/qmake/generators/os2/gnumake.cpp

@@ -73 +73 @@
     QString ret = path;
     // we assume that make variables contain paths already properly escaped
-    if (!path.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
+    if (!ret.isEmpty() && !ret.contains(QRegExp("\\$\\(([^$)]+)\\)"))) {
+        ret = unescapeFilePath(ret);
         if (!isDosLikeShell()) {
-            ret.remove('\"');
             ret.replace('\\', '/');
             ret.replace(' ', "\\ ");
         } else {
-            ret.replace(QRegExp("\""), "");
             ret.replace('/', '\\');
-            if (ret.contains(QRegExp("[ +&;%]")))
+            // Note: also quote paths ending with the backslash to avoid
+            // interpreting it as a linebreak
+            if (ret.contains(QRegExp("[ +&;%]")) || ret.endsWith('\\'))
                 ret = quote + ret + quote;
         }
@@ -96 +97 @@
     // it at runtime.
     QString ret = path;
-    bool matched = false;
-    if (path.contains("$("))
-        ret = escapeFileVars(path, &matched);
-    if (!matched) {
-        // didn't find variable references, do plain escaping
-        ret.remove('\"');
-        ret.replace(' ', "\\ ");
-        // and we still want to normalize slashes as this is what we do in
-        // other places (e.g. .cpp targets); this function will do it for
-        // QMAKE_EXTRA_TARGETS as well
-        if (!isDosLikeShell())
-            ret.replace('\\', '/');
-        else
-            ret.replace('/', '\\');
+    if (!ret.isEmpty()) {
+        bool matched = false;
+        if (path.contains("$("))
+            ret = escapeFileVars(path, &matched);
+        if (!matched) {
+            // didn't find variable references, do plain escaping
+            ret = unescapeFilePath(ret);
+            ret.replace(' ', "\\ ");
+            // and we still want to normalize slashes as this is what we do in
+            // other places (e.g. .cpp targets); this function will do it for
+            // QMAKE_EXTRA_TARGETS as well
+            if (!isDosLikeShell())
+                ret.replace('\\', '/');
+            else
+                ret.replace('/', '\\');
+        }
     }
     return ret;