From 10a6c925566711afc44db711fb10d6a4a0c70a91 Mon Sep 17 00:00:00 2001
Message-Id: <10a6c925566711afc44db711fb10d6a4a0c70a91.1715078036.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Tue, 30 Dec 2008 19:32:49 +0000
Subject: [PATCH] disorderfm preserves permissions now
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 CHANGES.html         |  4 +++-
 clients/disorderfm.c | 22 +++++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 98149aa..c4cbe1e 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -93,10 +93,12 @@ span.command {
 
       </div>
 
-    <h3>General</h3>
+    <h3>Miscellaneous</h3>
 
       <div class=section>
 
+        <p><tt>disorderfm</tt> now preserves directory permissions.</p>
+
         <p>DisOrder is now licensed under <a
          href="http://www.gnu.org/licenses/gpl-3.0.html">GPL v3</a>.  The main
         goal is to prohibit <a
diff --git a/clients/disorderfm.c b/clients/disorderfm.c
index 07743f8..241b701 100644
--- a/clients/disorderfm.c
+++ b/clients/disorderfm.c
@@ -136,6 +136,7 @@ static int copy(const char *from, const char *to) {
   int fdin, fdout;
   char buffer[4096];
   int n;
+  struct stat sb;
 
   if((fdin = open(from, O_RDONLY)) < 0)
     fatal(errno, "error opening %s", from);
@@ -146,6 +147,12 @@ static int copy(const char *from, const char *to) {
       fatal(errno, "error writing to %s", to);
   }
   if(n < 0) fatal(errno, "error reading %s", from);
+  if(fstat(fdin, &sb) < 0)
+    fatal(errno, "error stating %s", from);
+  if(fchown(fdout, sb.st_uid, sb.st_gid) < 0)
+    fatal(errno, "error chowning %s", from);
+  if(fchmod(fdout, sb.st_mode & 07777) < 0)
+    fatal(errno, "error chmoding %s", from);
   if(close(fdout) < 0) fatal(errno, "error closing %s", to);
   xclose(fdin);
   return 0;
@@ -310,7 +317,20 @@ static void visit(const char *path, const char *destpath) {
   
     /* We create the directory on the destination side.  If it already exists,
      * that's fine. */
-    if(dirmaker(fulldestpath, 0777) < 0 && errno != EEXIST) {
+    if(dirmaker(fulldestpath, 0700) == 0) {
+      if(dirmaker != nomkdir) {
+        /* Created new directory.  Adjust permissions and ownership to match the
+         * old one. */
+        if(chown(fulldestpath, sb.st_uid, sb.st_gid) < 0) {
+          error(errno, "cannot chown %s", errdestpath);
+          ++errors;
+        }
+        if(chmod(fulldestpath, sb.st_mode & 07777) < 0) {
+          error(errno, "cannot chmod %s", errdestpath);
+          ++errors;
+        }
+      }
+    } else if(errno != EEXIST) {
       error(errno, "cannot mkdir %s", errdestpath);
       ++errors;
       return;
-- 
[mdw]