posix/dir: add variadic args to directory scanning

Makefile.am

@@ -281,8 +281,9 @@ UTIL_FILES += 			\
     io_posix.hpp		\
     library_posix.hpp		\
     library_posix.cpp		\
-    posix/dir.hpp		\
     posix/dir.cpp		\
+    posix/dir.hpp		\
+    posix/dir.ipp		\
     time_posix.cpp
 
 endif

posix/dir.cpp

@@ -14,7 +14,7 @@
  * Copyright 2015 Danny Robson <danny@nerdcruft.net>
  */
 
-#include "dir.hpp"
+#include "./dir.hpp"
 
 #include "../except.hpp"
 
@@ -67,19 +67,6 @@ dir::operator DIR* (void)
 }
 
 
-///////////////////////////////////////////////////////////////////////////////
-void
-dir::scan(std::function<void(const char*)> cb)
-{
-    rewind ();
-
-    for (dirent *cursor; errno = 0, cursor = readdir (m_handle); )
-        cb (cursor->d_name);
-
-    errno_error::try_code ();
-}
-
-
 ///////////////////////////////////////////////////////////////////////////////
 void
 dir::rewind (void)

posix/dir.hpp

@@ -51,7 +51,13 @@ namespace util { namespace posix {
 
         operator DIR* (void);
 
-        void scan (std::function<void(const char*)>);
+        template <typename ...Args>
+        void
+        scan (std::function<void(const char*, Args&...)>, Args&...);
+
+        template <typename ...Args>
+        void
+        scan (void (*) (const char*, Args&...), Args&...);
 
         //entry begin (void) { rewind (); return { readdir (m_handle), m_handle }; }
         //entry end (void) { return { nullptr, m_handle }; }
@@ -63,4 +69,6 @@ namespace util { namespace posix {
     };
 } }
 
+#include "./dir.ipp"
+
 #endif

posix/dir.ipp

@@ -0,0 +1,44 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright 2015-2016 Danny Robson <danny@nerdcruft.net>
+ */
+
+#include "../except.hpp"
+
+///////////////////////////////////////////////////////////////////////////////
+template <typename ...Args>
+void
+util::posix::dir::scan(std::function<void(const char*, Args&...)> cb, Args &...args)
+{
+    rewind ();
+
+    for (dirent *cursor; errno = 0, cursor = readdir (m_handle); )
+        cb (cursor->d_name, args...);
+
+    errno_error::try_code ();
+}
+
+
+//-----------------------------------------------------------------------------
+template <typename ...Args>
+void
+util::posix::dir::scan (void (*cb) (const char*, Args&...), Args &...args)
+{
+    rewind ();
+
+    for (dirent *cursor; errno = 0, cursor = readdir (m_handle); )
+        cb (cursor->d_name, args...);
+
+    errno_error::try_code ();
+}