Implement in-process directory copy

sailfishos · May 27, 2013 · 652f343 · 652f343
1 parent 0c50437
commit 652f343
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
diff --git a/libssu/sandbox.cpp b/libssu/sandbox.cpp
@@ -10,6 +10,7 @@
 #include <stdlib.h>
 
 #include <QtCore/QDir>
+#include <QtCore/QDirIterator>
 #include <QtCore/QFileInfo>
 #include <QtCore/QProcessEnvironment>
 #include <QtCore/QSet>
@@ -252,7 +253,7 @@ bool Sandbox::prepare(){
 
     const QString sandboxCopyPath = QDir(m_tempDir).filePath("configroot");
 
-    if (QProcess::execute("cp", QStringList() << "-r" << m_sandboxPath << sandboxCopyPath) != 0){
+    if (!copyDir(m_sandboxPath, sandboxCopyPath)){
       qWarning("%s: Failed to copy sandbox directory", Q_FUNC_INFO);
       return false;
     }
@@ -265,3 +266,39 @@ bool Sandbox::prepare(){
   m_prepared = true;
   return true;
 }
+
+bool Sandbox::copyDir(const QString &directory, const QString &newName){
+  const QDir sourceRoot(directory);
+  const QDir destinationRoot(newName);
+
+  QDirIterator it(directory, QDir::AllEntries|QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+  while (it.hasNext()){
+    it.next();
+
+    const QFileInfo destination = QFileInfo(destinationRoot.filePath(
+          sourceRoot.relativeFilePath(it.filePath())));
+
+    if (it.fileInfo().isDir()){
+      if (!QDir().mkpath(destination.absoluteFilePath())){
+        qWarning("%s: Failed to mkpath '%s'", Q_FUNC_INFO, qPrintable(destination.absolutePath()));
+        return false;
+      }
+    } else if (it.fileInfo().isFile()){
+      if (!QDir().mkpath(destination.absolutePath())){
+        qWarning("%s: Failed to mkpath '%s'", Q_FUNC_INFO, qPrintable(destination.absolutePath()));
+        return false;
+      }
+
+      if (!QFile::copy(it.fileInfo().absoluteFilePath(), destination.absoluteFilePath())){
+        qWarning("%s: Failed to copy file '%s'", Q_FUNC_INFO, qPrintable(it.filePath()));
+        return false;
+      }
+    } else{
+      qWarning("%s: Cannot copy other than regular files: '%s'", Q_FUNC_INFO,
+          qPrintable(it.filePath()));
+      return false;
+    }
+  }
+
+  return true;
+}
diff --git a/libssu/sandbox_p.h b/libssu/sandbox_p.h
@@ -43,6 +43,7 @@ class Sandbox {
 
   private:
     bool prepare();
+    static bool copyDir(const QString &directory, const QString &newName);
 
   private:
     static Sandbox *s_activeInstance;