Ticket #1747: main.cpp.2.diff

main.cpp

@@ -615 +615 @@
 
         if (!gContext->GetNumSetting("SaveTranscoding", 0))
         {
-            if (unlink(oldfile) == -1)
-                perror(QString("mythtranscode: Error Deleting '%1'")
-                       .arg(oldfile).ascii());
+            int err;
+            bool followLinks = gContext->GetNumSetting("DeletesFollowLinks", 0);
+
+            VERBOSE(VB_FILE, QString("mythtranscode: About to unlink/delete file: %1").arg(oldfile));
+            if (followLinks)
+            {
+                QFileInfo finfo(oldfile);
+                if (finfo.isSymLink() && (err = unlink(finfo.readLink().local8Bit())))
+                {
+                     VERBOSE(VB_IMPORTANT, QString("Error deleting '%1' @ '%2', %3")
+                             .arg(oldfile).arg(finfo.readLink().local8Bit())
+                             .arg(strerror(errno)));
+                }
+            }
+ 
+            if ((err = unlink(oldfile.local8Bit())))
+            VERBOSE(VB_IMPORTANT, QString("mythtranscode: Error deleting '%1', %2")
+                    .arg(oldfile).arg(strerror(errno)));
         }
 
         oldfile = filename + ".png";