--- a/liboctave/system/file-stat.cc	Thu May 19 01:05:45 2016 -0400
+++ b/liboctave/system/file-stat.cc	Thu May 19 01:22:06 2016 -0400
@@ -36,248 +36,255 @@
 #include "file-stat.h"
 #include "statdefs.h"
 
-// FIXME: the is_* and mode_as_string functions are only valid
-// for initialized objects.  If called for an object that is not
-// initialized, they should throw an exception.
-
-bool
-base_file_stat::is_blk (void) const
-{
-  return exists () && is_blk (fs_mode);
-}
-
-bool
-base_file_stat::is_chr (void) const
-{
-  return exists () && is_chr (fs_mode);
-}
-
-bool
-base_file_stat::is_dir (void) const
-{
-  return exists () && is_dir (fs_mode);
-}
-
-bool
-base_file_stat::is_fifo (void) const
-{
-  return exists () && is_fifo (fs_mode);
-}
-
-bool
-base_file_stat::is_lnk (void) const
-{
-  return exists () && is_lnk (fs_mode);
-}
-
-bool
-base_file_stat::is_reg (void) const
+namespace octave
 {
-  return exists () && is_reg (fs_mode);
-}
+  namespace sys
+  {
+    // FIXME: the is_* and mode_as_string functions are only valid
+    // for initialized objects.  If called for an object that is not
+    // initialized, they should throw an exception.
+
+    bool
+    base_file_stat::is_blk (void) const
+    {
+      return exists () && is_blk (m_mode);
+    }
+
+    bool
+    base_file_stat::is_chr (void) const
+    {
+      return exists () && is_chr (m_mode);
+    }
+
+    bool
+    base_file_stat::is_dir (void) const
+    {
+      return exists () && is_dir (m_mode);
+    }
 
-bool
-base_file_stat::is_sock (void) const
-{
-  return exists () && is_sock (fs_mode);
-}
+    bool
+    base_file_stat::is_fifo (void) const
+    {
+      return exists () && is_fifo (m_mode);
+    }
+
+    bool
+    base_file_stat::is_lnk (void) const
+    {
+      return exists () && is_lnk (m_mode);
+    }
 
-bool
-base_file_stat::is_blk (mode_t mode)
-{
+    bool
+    base_file_stat::is_reg (void) const
+    {
+      return exists () && is_reg (m_mode);
+    }
+
+    bool
+    base_file_stat::is_sock (void) const
+    {
+      return exists () && is_sock (m_mode);
+    }
+
+    bool
+    base_file_stat::is_blk (mode_t mode)
+    {
 #if defined (S_ISBLK)
-  return S_ISBLK (mode);
+      return S_ISBLK (mode);
 #else
-  return false;
+      return false;
 #endif
-}
+    }
 
-bool
-base_file_stat::is_chr (mode_t mode)
-{
+    bool
+    base_file_stat::is_chr (mode_t mode)
+    {
 #if defined (S_ISCHR)
-  return S_ISCHR (mode);
+      return S_ISCHR (mode);
 #else
-  return false;
-#endif
-}
-
-bool
-base_file_stat::is_dir (mode_t mode)
-{
-#if defined (S_ISDIR)
-  return S_ISDIR (mode);
-#else
-  return false;
+      return false;
 #endif
-}
+    }
 
-bool
-base_file_stat::is_fifo (mode_t mode)
-{
-#if defined (S_ISFIFO)
-  return S_ISFIFO (mode);
+    bool
+    base_file_stat::is_dir (mode_t mode)
+    {
+#if defined (S_ISDIR)
+      return S_ISDIR (mode);
 #else
-  return false;
+      return false;
 #endif
-}
+    }
 
-bool
-base_file_stat::is_lnk (mode_t mode)
-{
-#if defined (S_ISLNK)
-  return S_ISLNK (mode);
+    bool
+    base_file_stat::is_fifo (mode_t mode)
+    {
+#if defined (S_ISFIFO)
+      return S_ISFIFO (mode);
 #else
-  return false;
+      return false;
 #endif
-}
+    }
 
-bool
-base_file_stat::is_reg (mode_t mode)
-{
+    bool
+    base_file_stat::is_lnk (mode_t mode)
+    {
+#if defined (S_ISLNK)
+      return S_ISLNK (mode);
+#else
+      return false;
+#endif
+    }
+
+    bool
+    base_file_stat::is_reg (mode_t mode)
+    {
 #if defined (S_ISREG)
-  return S_ISREG (mode);
+      return S_ISREG (mode);
 #else
-  return false;
+      return false;
 #endif
-}
+    }
 
-bool
-base_file_stat::is_sock (mode_t mode)
-{
+    bool
+    base_file_stat::is_sock (mode_t mode)
+    {
 #if defined (S_ISSOCK)
-  return S_ISSOCK (mode);
+      return S_ISSOCK (mode);
 #else
-  return false;
+      return false;
 #endif
-}
+    }
 
-std::string
-base_file_stat::mode_as_string (void) const
-{
-  char buf[12];
+    std::string
+    base_file_stat::mode_as_string (void) const
+    {
+      char buf[12];
 
-  strmode (fs_mode, buf);
+      strmode (m_mode, buf);
 
-  return std::string (buf);
-}
+      return std::string (buf);
+    }
 
-// Has FILE been modified since TIME?  Returns 1 for yes, 0 for no,
-// and -1 for any error.
+    // Has FILE been modified since TIME?  Returns 1 for yes, 0 for no,
+    // and -1 for any error.
 
-int
-base_file_stat::is_newer (const std::string& file, const octave::sys::time& time)
-{
-  file_stat fs (file);
+    int
+    base_file_stat::is_newer (const std::string& file,
+                              const octave::sys::time& time)
+    {
+      file_stat fs (file);
 
-  return fs ? fs.is_newer (time) : -1;
-}
-
-// Private stuff:
+      return fs ? fs.is_newer (time) : -1;
+    }
 
-void
-file_stat::update_internal (bool force)
-{
-  if (! initialized || force)
+    // Private stuff:
+
+    void
+    file_stat::update_internal (bool force)
     {
-      initialized = false;
-      fail = false;
+      if (! initialized || force)
+        {
+          initialized = false;
+          fail = false;
 
-      std::string full_file_name = octave::sys::file_ops::tilde_expand (file_name);
+          std::string full_file_name = octave::sys::file_ops::tilde_expand (file_name);
 
 #if defined (__WIN32__)
-      // Remove trailing slash.
-      if (octave::sys::file_ops::is_dir_sep (full_file_name[full_file_name.length () - 1])
-          && full_file_name.length () != 1
-          && ! (full_file_name.length () == 3 && full_file_name[1] == ':'))
-        full_file_name.resize (full_file_name.length () - 1);
+          // Remove trailing slash.
+          if (octave::sys::file_ops::is_dir_sep (full_file_name[full_file_name.length () - 1])
+              && full_file_name.length () != 1
+              && ! (full_file_name.length () == 3 && full_file_name[1] == ':'))
+            full_file_name.resize (full_file_name.length () - 1);
 #endif
 
-      const char *cname = full_file_name.c_str ();
+          const char *cname = full_file_name.c_str ();
 
-      struct stat buf;
+          struct stat buf;
 
-      int status = follow_links
-                   ? stat (cname, &buf) : gnulib::lstat (cname, &buf);
+          int status = follow_links
+            ? stat (cname, &buf) : gnulib::lstat (cname, &buf);
 
-      if (status < 0)
-        {
-          fail = true;
-          errmsg = gnulib::strerror (errno);
-        }
-      else
-        {
-          fs_mode = buf.st_mode;
-          fs_ino = buf.st_ino;
-          fs_dev = buf.st_dev;
-          fs_nlink = buf.st_nlink;
-          fs_uid = buf.st_uid;
-          fs_gid = buf.st_gid;
-          fs_size = buf.st_size;
-          fs_atime = buf.st_atime;
-          fs_mtime = buf.st_mtime;
-          fs_ctime = buf.st_ctime;
+          if (status < 0)
+            {
+              fail = true;
+              errmsg = gnulib::strerror (errno);
+            }
+          else
+            {
+              m_mode = buf.st_mode;
+              m_ino = buf.st_ino;
+              m_dev = buf.st_dev;
+              m_nlink = buf.st_nlink;
+              m_uid = buf.st_uid;
+              m_gid = buf.st_gid;
+              m_size = buf.st_size;
+              m_atime = buf.st_atime;
+              m_mtime = buf.st_mtime;
+              m_ctime = buf.st_ctime;
 
 #if defined (HAVE_STRUCT_STAT_ST_RDEV)
-          fs_rdev = buf.st_rdev;
+              m_rdev = buf.st_rdev;
 #endif
 
 #if defined (HAVE_STRUCT_STAT_ST_BLKSIZE)
-          fs_blksize = buf.st_blksize;
+              m_blksize = buf.st_blksize;
 #endif
 
 #if defined (HAVE_STRUCT_STAT_ST_BLOCKS)
-          fs_blocks = buf.st_blocks;
+              m_blocks = buf.st_blocks;
 #endif
-        }
+            }
 
-      initialized = true;
+          initialized = true;
+        }
     }
-}
 
-void
-file_fstat::update_internal (bool force)
-{
-  if (! initialized || force)
+    void
+    file_fstat::update_internal (bool force)
     {
-      initialized = false;
-      fail = false;
+      if (! initialized || force)
+        {
+          initialized = false;
+          fail = false;
 
-      struct stat buf;
+          struct stat buf;
 
-      int status = gnulib::fstat (fid, &buf);
+          int status = gnulib::fstat (fid, &buf);
 
-      if (status < 0)
-        {
-          fail = true;
-          errmsg = gnulib::strerror (errno);
-        }
-      else
-        {
-          fs_mode = buf.st_mode;
-          fs_ino = buf.st_ino;
-          fs_dev = buf.st_dev;
-          fs_nlink = buf.st_nlink;
-          fs_uid = buf.st_uid;
-          fs_gid = buf.st_gid;
-          fs_size = buf.st_size;
-          fs_atime = buf.st_atime;
-          fs_mtime = buf.st_mtime;
-          fs_ctime = buf.st_ctime;
+          if (status < 0)
+            {
+              fail = true;
+              errmsg = gnulib::strerror (errno);
+            }
+          else
+            {
+              m_mode = buf.st_mode;
+              m_ino = buf.st_ino;
+              m_dev = buf.st_dev;
+              m_nlink = buf.st_nlink;
+              m_uid = buf.st_uid;
+              m_gid = buf.st_gid;
+              m_size = buf.st_size;
+              m_atime = buf.st_atime;
+              m_mtime = buf.st_mtime;
+              m_ctime = buf.st_ctime;
 
 #if defined (HAVE_STRUCT_STAT_ST_RDEV)
-          fs_rdev = buf.st_rdev;
+              m_rdev = buf.st_rdev;
 #endif
 
 #if defined (HAVE_STRUCT_STAT_ST_BLKSIZE)
-          fs_blksize = buf.st_blksize;
+              m_blksize = buf.st_blksize;
 #endif
 
 #if defined (HAVE_STRUCT_STAT_ST_BLOCKS)
-          fs_blocks = buf.st_blocks;
+              m_blocks = buf.st_blocks;
 #endif
-        }
+            }
 
-      initialized = true;
+          initialized = true;
+        }
     }
+  }
 }