Added read-only file error test.

base/test/test_file_util_posix.cc

 // Copyright (c) 2011 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 "base/test/test_file_util.h"
 
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ skipping 14 matching lines @@
 bool DenyFilePermission(const FilePath& path, mode_t permission) {
   struct stat stat_buf;
   if (stat(path.value().c_str(), &stat_buf) != 0)
     return false;
   stat_buf.st_mode &= ~permission;
 
   int rv = HANDLE_EINTR(chmod(path.value().c_str(), stat_buf.st_mode));
   return rv == 0;
 }
 
+// Gets a blob indicating the permission information for |path|.
+// |length| is the length of the blob.  Zero on failure.
+// Returns the blob pointer, or NULL on failure.
+void* GetPermissionInfo(const FilePath& path, size_t* length) {
+  DCHECK(length != NULL);

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

nit: Just DCHECK(length) if it compiles.

[ahendrickson, 2012/03/01 15:18:19]

Done.

+  *length = 0;
+
+  struct stat stat_buf;
+  if (stat(path.value().c_str(), &stat_buf) != 0)
+    return NULL;
+
+  *length = sizeof(mode_t);
+  mode_t* mode = new mode_t;
+  *mode = stat_buf.st_mode;

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

That also drags in the type of the thing, i.e. directory vs. file vs. special
file and so on. How about &-ing it with ~S_IFMT?

[ahendrickson, 2012/03/01 15:18:19]

Done.

+
+  return mode;
+}
+
+// Restores the permission information for |path|, given the blob retrieved
+// using |GetPermissionInfo()|.
+// |info| is the pointer to the blob.
+// |length| is the length of the blob.
+// Either |info| or |length| may be NULL/0, in which case nothing happens.
+bool RestorePermissionInfo(const FilePath& path, void* info, size_t length) {
+  if (!info || !length)

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

Don't treat |length| as a boolean. Do length == 0 explicitly.

[ahendrickson, 2012/03/01 15:18:19]

Done.

+    return false;
+
+  DCHECK_EQ(sizeof(mode_t), length);
+  mode_t* mode = reinterpret_cast<mode_t*>(info);
+
+  int rv = HANDLE_EINTR(chmod(path.value().c_str(), *mode));
+
+  delete mode;  // AKA info.

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

nit: No need for that comment.

[ahendrickson, 2012/03/01 15:18:19]

Done.

+
+  return rv == 0;
+}
+
 }  // namespace
 
 bool DieFileDie(const FilePath& file, bool recurse) {
   // There is no need to workaround Windows problems on POSIX.
   // Just pass-through.
   return file_util::Delete(file, recurse);
 }
 
 // Mostly a verbatim copy of CopyDirectory
 bool CopyRecursiveDirNoCache(const FilePath& source_dir,
@@ skipping 88 matching lines @@
 }
 
 bool MakeFileUnreadable(const FilePath& path) {
   return DenyFilePermission(path, S_IRUSR | S_IRGRP | S_IROTH);
 }
 
 bool MakeFileUnwritable(const FilePath& path) {
   return DenyFilePermission(path, S_IWUSR | S_IWGRP | S_IWOTH);
 }
 
+PermissionRestorer::PermissionRestorer(const FilePath& path)
+    : path_(path), info_(NULL), length_(0) {
+  info_ = GetPermissionInfo(path_, &length_);

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

Why don't you just paste the body of GetPermissionInfo inline here? Should be
easier to read.

[ahendrickson, 2012/03/01 15:18:19]

This seems pretty straightforward to me.

+  DCHECK(info_ != NULL);
+  DCHECK_NE(0u, length_);
+}
+
+PermissionRestorer::~PermissionRestorer() {
+  if (!RestorePermissionInfo(path_, info_, length_))

[Paweł Hajdan Jr., 2012/02/28 07:55:55]

Same here.

[ahendrickson, 2012/03/01 15:18:19]

Ditto.

+    NOTREACHED();
+}
+
 }  // namespace file_util