Ticket #12376: deletefile.diff

mythtv/programs/mythbackend/mainserver.cpp

@@ -2235 +2235 @@
     }
 }
 
+
+bool MainServer::removeDir(const QString &dirname)
+{
+    QDir dir(dirname);
+
+    if (!dir.exists())
+        return false;
+
+    dir.setFilter(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
+    QFileInfoList list = dir.entryInfoList();
+    QFileInfoList::const_iterator it = list.begin();
+    const QFileInfo *fi;
+
+    while (it != list.end())
+    {
+        fi = &(*it++);
+        if (fi->isFile() && !fi->isSymLink())
+        {
+            QFile::remove(fi->absoluteFilePath());
+        }
+        else if (fi->isDir() && !fi->isSymLink())
+        {
+            if(!removeDir(fi->absoluteFilePath())) return false;
+        }
+    }
+
+    dir.rmdir(dirname);
+        return true;
+}
+
 /**
  *  \brief Deletes links and unlinks the main file and returns the descriptor.
  *
@@ -2285 +2315 @@
             return -2; // valid result, not an error condition
     }
 
-    if (fd < 0)
+    if (fd < 0 && errno != EISDIR)
         LOG(VB_GENERAL, LOG_ERR, errmsg + ENO);
 
     return fd;
 }
 
+
+
 /** \fn MainServer::OpenAndUnlink(const QString&)
  *  \brief Opens a file, unlinks it and returns the file descriptor.
  *
@@ -2308 +2340 @@
 
     if (fd == -1)
     {
-        LOG(VB_GENERAL, LOG_ERR, msg + " could not open " + ENO);
-        return -1;
-    }
-
-    if (unlink(fname.constData()))
+        if (errno == EISDIR)
+        {
+                if(!removeDir(filename))
+                {
+                        LOG(VB_GENERAL, LOG_ERR, msg + " could not delete directory " + ENO);
+                        return -1;
+                }
+        }
+        else
+        {
+                LOG(VB_GENERAL, LOG_ERR, msg + " could not open " + ENO);
+                return -1;
+        }
+    }
+    else if (unlink(fname.constData()))
     {
         LOG(VB_GENERAL, LOG_ERR, msg + " could not unlink " + ENO);
         close(fd);

mythtv/programs/mythbackend/mainserver.h

@@ -256 +256 @@
 
     void SetExitCode(int exitCode, bool closeApplication);
 
+    static bool removeDir(const QString &dirname);
     static int  DeleteFile(const QString &filename, bool followLinks,
                            bool deleteBrokenSymlinks = false);
     static int  OpenAndUnlink(const QString &filename);