[Pkg-owncloud-commits] [owncloud-client] 164/484: Merge pull request #4004 from owncloud/fix_hidden_detection

[Sandro Knauß]

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

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 0c9568f6dce2b55afef94d9502b17979114abff2
Merge: f1d48a9 6b71273
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Wed Oct 28 09:28:35 2015 +0100

    Merge pull request #4004 from owncloud/fix_hidden_detection
    
    Fix hidden detection

 csync/src/csync_update.c       | 14 ++++++-
 src/libsync/discoveryphase.cpp |  8 +++-
 translations/client_zh_TW.ts   | 83 ++++++++++++++++++++++--------------------
 3 files changed, 62 insertions(+), 43 deletions(-)

diff --cc csync/src/csync_update.c
index 779f83b,49546d5..4945d44
--- a/csync/src/csync_update.c
+++ b/csync/src/csync_update.c
@@@ -741,8 -747,19 +741,18 @@@ int csync_ftw(CSYNC *ctx, const char *u
          res = 0;
      }
  
+     /* for non windows platforms, detect if the filename starts with a .
+      * and if so, it's a hidden file. For windows, the hidden state is
+      * discovered within the vio local stat function.
+      */
+ #ifndef _WIN32
+     if( d_name[0] == '.' ) {
+         fs->flags |= CSYNC_VIO_FILE_FLAGS_HIDDEN;
+     }
+ #endif
+ 
      if( res == 0) {
 -      switch (fs->type) {
 +      switch (dirent->type) {
          case CSYNC_VIO_FILE_TYPE_SYMBOLIC_LINK:
            flag = CSYNC_FTW_FLAG_SLINK;
            break;

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