Ticket #5792: 5792-v2.patch

libs/libmyth/mythmedia.cpp

@@ -62 +62 @@
     m_Status = MEDIASTAT_UNKNOWN;
     m_MediaType = MEDIATYPE_UNKNOWN;
 
-    QFileInfo fi(DevicePath);
-    if (fi.isSymLink())
-        m_RealDevice = m_DevicePath.section('/', 0, -2) + "/" + fi.readLink();
-    else
-        m_RealDevice = QString::null;
+    m_RealDevice = QString::null;
+
+    QFileInfo fi(m_DevicePath);
+    QString link = QString:: null;
+    for (uint i = 0; (i < 256) && fi.isSymLink() &&
+             !(link = fi.readLink()).isEmpty(); i++)
+    {
+        if (link[0] == '/') // absolute link
+            m_RealDevice = link;
+        else // relative link..
+            m_RealDevice = fi.absoluteDir().absolutePath() + "/" + link;
+        fi = QFileInfo(m_RealDevice);
+    }
 }
 
 bool MythMediaDevice::openDevice()
@@ -378 +386 @@
         QString    link = QString::null;
 
         // If the device name in the mounts file is a symlink, follow it..
-        if (fi.isSymLink() && !(link = fi.readLink()).isEmpty())
+        for (uint i = 0; (i < 256) && fi.isSymLink() &&
+                 !(link = fi.readLink()).isEmpty(); i++)
         {
             if (link[0] == '/') // absolute link
                 deviceNames.push_back(link);
             else // relative link..
-                deviceNames.push_back(fi.absoluteDir().absolutePath()
-                                      + "/" + link);
+            {
+                deviceNames.push_back(
+                    fi.absoluteDir().absolutePath() + "/" + link);
+            }
+            fi = QFileInfo(deviceNames.back());
         }