Mercurial > octave

diff liboctave/system/dir-ops.cc @ 21926:24215a16f3b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hide dirent.h header * liboctave/wrappers/dirent-wrappers.c, liboctave/wrappers/dirent-wrappers.h: New files. * liboctave/wrappers/module.mk: Update. * dir-ops.cc, dir-ops.h: Use new wrapper functions. (dir_entry::close): Return status. (dir_entry::max_name_length): New function. * kpse.cc: Use octave::sys::dir_entry::max_name_length function instead of NAME_MAX macro.
author John W. Eaton <jwe@octave.org>
date Thu, 16 Jun 2016 10:02:49 -0400
parents a25110491607
children aab79a1885cc
line wrap: on
line diff
--- a/liboctave/system/dir-ops.cc	Thu Jun 16 08:42:29 2016 -0700
+++ b/liboctave/system/dir-ops.cc	Thu Jun 16 10:02:49 2016 -0400
@@ -31,7 +31,7 @@
 #include <list>
 #include <string>
 
-#include <dirent.h>
+#include "dirent-wrappers.h"
 
 #include "dir-ops.h"
 #include "file-ops.h"
@@ -46,8 +46,6 @@
     bool
     dir_entry::open (const std::string& n)
     {
-      fail = true;
-
       if (! n.empty ())
         name = n;
 
@@ -57,17 +55,15 @@
 
           std::string fullname = octave::sys::file_ops::tilde_expand (name);
 
-          dir = static_cast<void *> (gnulib::opendir (fullname.c_str ()));
+          dir = octave_opendir_wrapper (fullname.c_str ());
 
-          if (dir)
-            fail = false;
-          else
+          if (! dir)
             errmsg = gnulib::strerror (errno);
         }
       else
         errmsg = "dir_entry::open: empty filename";
 
-      return ! fail;
+      return dir != 0;
     }
 
     string_vector
@@ -79,15 +75,10 @@
         {
           std::list<std::string> dirlist;
 
-          struct dirent *dir_ent;
+          char *fname;
 
-          while ((dir_ent = gnulib::readdir (static_cast<DIR *> (dir))))
-            {
-              if (dir_ent)
-                dirlist.push_back (dir_ent->d_name);
-              else
-                break;
-            }
+          while ((fname = octave_readdir_wrapper (dir)))
+            dirlist.push_back (fname);
 
           retval = string_vector (dirlist);
         }
@@ -95,13 +86,20 @@
       return retval;
     }
 
-    void
+    bool
     dir_entry::close (void)
     {
-      if (dir)
-        gnulib::closedir (static_cast<DIR *> (dir));
+      bool retval = (octave_closedir_wrapper (dir) == 0);
 
       dir = 0;
+
+      return retval;
+    }
+
+    unsigned int
+    dir_entry::max_name_length (void)
+    {
+      return octave_name_max_wrapper ();
     }
   }
 }