[NaCl SDK] nacl_io: Fix utime() on directories.

native_client_sdk/src/libraries/nacl_io/fusefs/fuse_fs.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "nacl_io/fusefs/fuse_fs.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <string.h>
 
@@ skipping 72 matching lines @@
       return ENOSYS;
     }
   } else {
     // First determine if this is a regular file or a directory.
     if (fuse_ops_->getattr) {
       struct stat statbuf;
       result = fuse_ops_->getattr(path_cstr, &statbuf);
       if (result < 0)
         return -result;
 
-      if ((statbuf.st_mode & S_IFMT) == S_IFDIR) {
+      if (S_ISDIR(statbuf.st_mode)) {
         // This is a directory. Don't try to open, just create a new node with
         // this path.
         ScopedNode node(new DirFuseFsNode(this, fuse_ops_, fi, path_cstr));
         Error error = node->Init(open_flags);
         if (error)
           return error;
 
         *out_node = node;
         return 0;
       }
       // Get mode.
-      mode = statbuf.st_mode & ~S_IFMT;
+      mode = statbuf.st_mode & 0777;

[bradn, 2014/10/20 17:17:34]

So we're explicitly excluding things like suid?

     }
 
     // Existing file.
     if (open_flags & O_TRUNC) {
       // According to the FUSE docs, O_TRUNC does two calls: first truncate()
       // then open().
       if (!fuse_ops_->truncate) {
         LOG_TRACE("fuse_ops_->truncate is NULL.");
         return ENOSYS;
       }
@@ skipping 66 matching lines @@
   if (error)
     return error;
 
   struct stat statbuf;
   error = node->GetStat(&statbuf);
   if (error)
     return error;
 
   node.reset();
 
-  if ((statbuf.st_mode & S_IFMT) == S_IFDIR) {
+  if (S_ISDIR(statbuf.st_mode)) {
     return Rmdir(path);
   } else {
     return Unlink(path);
   }
 }
 
 Error FuseFs::Rename(const Path& path, const Path& newpath) {
   if (!fuse_ops_->rename) {
     LOG_TRACE("fuse_ops_->rename is NULL.");
     return ENOSYS;
@@ skipping 287 matching lines @@
   } else {
     fill_info->getdents->AddDirent(ino, name, strlen(name));
     fill_info->num_bytes -= sizeof(dirent);
     // According to the docs, we can never return 1 (buffer full) when the
     // offset is zero (the user is probably ignoring the result anyway).
     return 0;
   }
 }
 
 }  // namespace nacl_io