1 files changed, 28 insertions, 57 deletions

diff --git a/libbutl/b.cxx b/libbutl/b.cxx
index 86a87ff..0b4472f 100644
--- a/libbutl/b.cxx
+++ b/libbutl/b.cxx
@@ -1,59 +1,19 @@
 // file      : libbutl/b.cxx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef __cpp_modules_ts
-#include <libbutl/b.mxx>
-#endif
-
-// C includes.
+#include <libbutl/b.hxx>
 
+#include <ios>       // ios::failure
 #include <cassert>
-
-#ifndef __cpp_lib_modules_ts
-#include <string>
-#include <vector>
-#include <cstddef>
-#include <cstdint>
-#include <stdexcept>
-#include <functional>
-
-#include <ios>     // ios::failure
-#include <utility> // move()
+#include <utility>   // move()
 #include <sstream>
 #include <algorithm>
-#endif
-
-// Other includes.
-
-#ifdef __cpp_modules_ts
-module butl.b;
-
-// Only imports additional to interface.
-#ifdef __clang__
-#ifdef __cpp_lib_modules_ts
-import std.core;
-import std.io;
-#endif
-import butl.url;
-import butl.path;
-import butl.process;
-import butl.optional;
-import butl.project_name;
-import butl.standard_version;
-#endif
-
-import butl.utility;      // next_word(), eof(), etc
-import butl.path_io;
-import butl.fdstream;
-import butl.process_io;   // operator<<(ostream, process_path)
-import butl.small_vector;
-#else
-#include <libbutl/utility.mxx>
-#include <libbutl/path-io.mxx>
-#include <libbutl/fdstream.mxx>
-#include <libbutl/process-io.mxx>
-#include <libbutl/small-vector.mxx>
-#endif
+
+#include <libbutl/utility.hxx>      // next_word(), eof(), etc
+#include <libbutl/path-io.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/process-io.hxx>   // operator<<(ostream, process_path)
+#include <libbutl/small-vector.hxx>
 
 using namespace std;
 
@@ -75,7 +35,7 @@ namespace butl
   void
   b_info (std::vector<b_project_info>& r,
           const vector<dir_path>& projects,
-          bool ext_mods,
+          b_info_flags fl,
           uint16_t verb,
           const function<b_callback>& cmd_callback,
           const path& program,
@@ -121,13 +81,22 @@ namespace butl
         else
           vops.push_back ("-q");
 
-        vector<string> ps;
-        ps.reserve (projects.size ());
+        string spec ("info(");
 
         // Note that quoting is essential here.
         //
-        for (const dir_path& p: projects)
-          ps.push_back ("'" + p.representation () + "'");
+        for (size_t i (0); i != projects.size(); ++i)
+        {
+          if (i != 0)
+            spec += ' ';
+
+          spec += '\'' + projects[i].representation () + '\'';
+        }
+
+        if ((fl & b_info_flags::subprojects) == b_info_flags::none)
+          spec += ",no_subprojects";
+
+        spec += ')';
 
         pr = process_start_callback (
           cmd_callback ? cmd_callback : [] (const char* const*, size_t) {},
@@ -136,10 +105,12 @@ namespace butl
           2 /* stderr */,
           pp,
           vops,
-          ext_mods ? nullptr : "--no-external-modules",
+          ((fl & b_info_flags::ext_mods) == b_info_flags::none
+           ? "--no-external-modules"
+           : nullptr),
           "-s",
           ops,
-          "info:", ps);
+          spec);
 
         pipe.out.close ();
         ifdstream is (move (pipe.in), fdstream_mode::skip, ifdstream::badbit);
@@ -337,7 +308,7 @@ namespace butl
       assert (!pr.wait ());
 
       throw b_error (
-        string ("process ") + pp.recall_string () + " " + to_string (*pr.exit),
+        string ("process ") + pp.recall_string () + ' ' + to_string (*pr.exit),
         move (pr.exit));
     }
     catch (const process_error& e)