[Pkg-owncloud-commits] [owncloud-client] 160/171: Discovery: don't ignore recall file #4420

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to annotated tag upstream/2.1.1+dfsg
in repository owncloud-client.

commit 6b643c7501be0802b82334d220c0f60a132f7770
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Feb 8 12:07:34 2016 +0100

    Discovery: don't ignore recall file #4420
    
    The ".sys.admin#recall#" is the recall file and should not be ignored
    even if hidden.
    
    The remote discovery do not need to detect hidden files because it
    is already detected by csync in all cases. So this avoid code duplication
---
 csync/src/csync_update.c       | 4 +++-
 src/libsync/discoveryphase.cpp | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/csync/src/csync_update.c b/csync/src/csync_update.c
index 90208d9..618c296 100644
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@ -820,7 +820,9 @@ int csync_ftw(CSYNC *ctx, const char *uri, csync_walker_fn fn,
      * local stat function.
      */
     if( d_name[0] == '.' ) {
-        dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        if (strcmp(".sys.admin#recall#", d_name) != 0) { /* recall file shall not be ignored (#4420) */
+            dirent->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
+        }
     }
 
     if( res == 0) {
diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index 9c73e07..dd00158 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -325,9 +325,6 @@ void DiscoverySingleDirectoryJob::directoryListingIteratedSlot(QString file, con
         if( slashPos > -1 ) {
             fileRef = file.midRef(slashPos+1);
         }
-        if( fileRef.startsWith(QChar('.')) ) {
-            file_stat->flags = CSYNC_VIO_FILE_FLAGS_HIDDEN;
-        }
         //qDebug() << "!!!!" << file_stat << file_stat->name << file_stat->file_id << map.count();
         _results.append(file_stat);
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git