Added irt extension support for supplying the nacl_irt_memory interface.

tests/irt_ext/file_desc.c

 /*
  * Copyright (c) 2014 The Native Client 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 <errno.h>
 #include <fcntl.h>
 #include <string.h>
 
-#include "native_client/tests/irt_ext/file_desc.h"
 #include "native_client/src/include/nacl_assert.h"
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/untrusted/irt/irt_dev.h"
 #include "native_client/src/untrusted/irt/irt_extension.h"
+#include "native_client/tests/irt_ext/file_desc.h"
 
 static struct file_desc_environment *g_activated_env = NULL;
 static const struct inode_data g_default_inode = {
   .valid = false,
   .mode = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP,
 };
 
 static struct inode_data g_root_dir = {
   .valid = true,
   .mode = S_IFDIR,
@@ skipping 246 matching lines @@
                        size_t *nread) {
   return ENOSYS;
 }
 
 static int my_utimes(const char *filename, const struct timeval *times) {
   return ENOSYS;
 }
 
 /* Module file_desc functions. */
 void init_file_desc_module(void) {
+  size_t size;

[Roland McGrath, 2014/08/28 23:27:42]

Use C99 style rather than predeclaring a local

[David Yen, 2014/08/29 16:43:33]

Done.

   struct nacl_irt_dev_fdio fdio = {
     my_close,
     my_dup,
     my_dup2,
     my_read,
     my_write,
     my_seek,
     my_fstat,
     my_getdents,
     my_fchdir,
     my_fchmod,
     my_fsync,
     my_fdatasync,
     my_ftruncate,
     my_isatty,
   };
 
-  /* These tables should have share common prefixes with one another. */
-  ASSERT_GT(sizeof(struct nacl_irt_dev_fdio_v0_2),
-            sizeof(struct nacl_irt_fdio));
-  ASSERT_GT(sizeof(struct nacl_irt_dev_fdio),
-            sizeof(struct nacl_irt_dev_fdio_v0_2));
-
-  nacl_interface_ext_supply(NACL_IRT_FDIO_v0_1, &fdio,
-                            sizeof(struct nacl_irt_fdio));
-  nacl_interface_ext_supply(NACL_IRT_DEV_FDIO_v0_2, &fdio,
-                            sizeof(struct nacl_irt_dev_fdio_v0_2));
-  nacl_interface_ext_supply(NACL_IRT_DEV_FDIO_v0_3, &fdio,
-                            sizeof(fdio));
+  size = nacl_interface_ext_supply(NACL_IRT_DEV_FDIO_v0_3, &fdio,
+                                   sizeof(fdio));
+  ASSERT_EQ(size, sizeof(fdio));
 
   struct nacl_irt_dev_filename fname = {
     my_open,
     my_stat,
     my_mkdir,
     my_rmdir,
     my_chdir,
     my_getcwd,
     my_unlink,
     my_truncate,
     my_lstat,
     my_link,
     my_rename,
     my_symlink,
     my_chmod,
     my_access,
     my_readlink,
     my_utimes,
   };
 
   /* These tables should have share common prefixes with one another. */
-  ASSERT_GT(sizeof(struct nacl_irt_dev_filename_v0_2),
-            sizeof(struct nacl_irt_filename));
-  ASSERT_GT(sizeof(struct nacl_irt_dev_filename),
-            sizeof(struct nacl_irt_dev_filename_v0_2));
-
-  nacl_interface_ext_supply(NACL_IRT_FILENAME_v0_1, &fname,
-                            sizeof(struct nacl_irt_filename));
-  nacl_interface_ext_supply(NACL_IRT_DEV_FILENAME_v0_2, &fname,
-                            sizeof(struct nacl_irt_dev_filename_v0_2));
-  nacl_interface_ext_supply(NACL_IRT_DEV_FILENAME_v0_3, &fname,
-                            sizeof(fname));
+  size = nacl_interface_ext_supply(NACL_IRT_DEV_FILENAME_v0_3, &fname,
+                                   sizeof(fname));
+  ASSERT_EQ(size, sizeof(fname));
 }
 
 void init_inode_data(struct inode_data *inode_data) {
   *inode_data = g_default_inode;
 }
 
 void init_file_descriptor(struct file_descriptor *file_desc) {
   file_desc->valid = false;
   file_desc->data = NULL;
 }
@@ skipping 76 matching lines @@
   return find_inode_name(env, current_dir, path_iter, strlen(path_iter));
 }
 
 void activate_file_desc_env(struct file_desc_environment *env) {
   g_activated_env = env;
 }
 
 void deactivate_file_desc_env(void) {
   g_activated_env = NULL;
 }