[util] Refactor batch-processing code into batch.hh

test/subset/run-repack-tests.py

@@ -24,7 +24,7 @@ ots_sanitize = shutil.which ("ots-sanitize")
 
 def subset_cmd (command):
 	global process
-	process.stdin.write ((';'.join (command) + '\n').encode ("utf-8"))
+	process.stdin.write ((':'.join (command) + '\n').encode ("utf-8"))
 	process.stdin.flush ()
 	return process.stdout.readline().decode ("utf-8").strip ()
 

test/subset/run-tests.py

@@ -24,7 +24,7 @@ ots_sanitize = shutil.which ("ots-sanitize")
 
 def subset_cmd (command):
 	global process
-	process.stdin.write ((';'.join (command) + '\n').encode ("utf-8"))
+	process.stdin.write ((':'.join (command) + '\n').encode ("utf-8"))
 	process.stdin.flush ()
 	return process.stdout.readline().decode ("utf-8").strip ()
 

util/Makefile.sources

@@ -16,6 +16,7 @@ HB_VIEW_sources = \
 	$(NULL)
 
 HB_SHAPE_sources = \
+	batch.hh \
 	face-options.hh \
 	font-options.hh \
 	hb-shape.cc \
@@ -29,6 +30,7 @@ HB_SHAPE_sources = \
 	$(NULL)
 
 HB_SUBSET_CLI_sources = \
+	batch.hh \
 	face-options.hh \
 	hb-subset.cc \
 	main-font-text.hh \

util/batch.hh

@@ -0,0 +1,72 @@
+/*
+ * Copyright © 2021  Behdad Esfahbod
+ *
+ *  This is part of HarfBuzz, a text shaping library.
+ *
+ * Permission is hereby granted, without written agreement and without
+ * license or royalty fees, to use, copy, modify, and distribute this
+ * software and its documentation for any purpose, provided that the
+ * above copyright notice and the following two paragraphs appear in
+ * all copies of this software.
+ *
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR
+ * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES
+ * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN
+ * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS
+ * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO
+ * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+ */
+
+#ifndef BATCH_HH
+#define BATCH_HH
+
+typedef int (*main_func_t) (int argc, char **argv);
+
+template <bool report_status=false>
+int
+batch_main (main_func_t main_func, int argc, char **argv)
+{
+  if (argc == 2 && !strcmp (argv[1], "--batch"))
+  {
+    int ret = 0;
+    char buf[4092];
+    while (fgets (buf, sizeof (buf), stdin))
+    {
+      size_t l = strlen (buf);
+      if (l && buf[l - 1] == '\n') buf[l - 1] = '\0';
+
+      char *args[32];
+      argc = 0;
+      char *p = buf, *e;
+      args[argc++] = p;
+      unsigned start_offset = 0;
+      while ((e = strchr (p + start_offset, ':')) && argc < (int) ARRAY_LENGTH (args))
+      {
+	*e++ = '\0';
+	while (*e == ':')
+	  e++;
+	args[argc++] = p = e;
+	/* UGH. Skip 2 first bytes on first argument if is Windows path, "C:\..." */
+	start_offset = argc == 2 && p[0] != '\0' && p[0] != ':' && p[1] == ':' && (p[2] == '\\' || p[2] == '/') ? 2 : 0;
+      }
+
+      int result = main_func (argc, args);
+
+      if (report_status)
+	fprintf (stdout, result == 0 ? "success\n" : "failure\n");
+      fflush (stdout);
+
+      ret = MAX (ret, result);
+    }
+    return ret;
+  }
+
+  return main_func (argc, argv);
+}
+
+#endif

util/hb-shape.cc

@@ -30,6 +30,7 @@
 #include "text-options.hh"
 #include "shape-consumer.hh"
 #include "shape-format.hh"
+#include "batch.hh"
 #include "main-font-text.hh"
 
 const unsigned DEFAULT_FONT_SIZE = FONT_SIZE_UPEM;
@@ -162,36 +163,5 @@ int
 main (int argc, char **argv)
 {
   auto main_func = main_font_text<shape_consumer_t<output_buffer_t>, font_options_t, text_options_t>;
-
+  return batch_main<> (main_func, argc, argv);
-  if (argc == 2 && !strcmp (argv[1], "--batch"))
-  {
-    unsigned int ret = 0;
-    char buf[4092];
-    while (fgets (buf, sizeof (buf), stdin))
-    {
-      size_t l = strlen (buf);
-      if (l && buf[l - 1] == '\n') buf[l - 1] = '\0';
-
-      char *args[32];
-      argc = 0;
-      char *p = buf, *e;
-      args[argc++] = p;
-      unsigned start_offset = 0;
-      while ((e = strchr (p + start_offset, ':')) && argc < (int) ARRAY_LENGTH (args))
-      {
-	*e++ = '\0';
-	while (*e == ':')
-	  e++;
-	args[argc++] = p = e;
-	/* Skip 2 first bytes on first argument if is Windows path, "C:\..." */
-	start_offset = argc == 2 && p[0] != '\0' && p[0] != ':' && p[1] == ':' && (p[2] == '\\' || p[2] == '/') ? 2 : 0;
-      }
-
-      ret |= main_func (argc, args);
-      fflush (stdout);
-    }
-    return ret;
-  }
-
-  return main_func (argc, argv);
 }

util/hb-subset.cc

@@ -31,6 +31,7 @@
 #include "output-options.hh"
 #include "face-options.hh"
 #include "text-options.hh"
+#include "batch.hh"
 #include "main-font-text.hh"
 
 /*
@@ -132,36 +133,5 @@ int
 main (int argc, char **argv)
 {
   auto main_func = main_font_text<subset_consumer_t, face_options_t, text_options_t>;
-
+  return batch_main<true> (main_func, argc, argv);
-  if (argc == 2 && !strcmp (argv[1], "--batch"))
-  {
-    unsigned int ret = 0;
-    char buf[4092];
-    while (fgets (buf, sizeof (buf), stdin))
-    {
-      size_t l = strlen (buf);
-      if (l && buf[l - 1] == '\n') buf[l - 1] = '\0';
-
-      char *args[32];
-      argc = 0;
-      char *p = buf, *e;
-      args[argc++] = p;
-      unsigned start_offset = 0;
-      while ((e = strchr (p + start_offset, ';')) && argc < (int) ARRAY_LENGTH (args))
-      {
-	*e++ = '\0';
-	while (*e == ':')
-	  e++;
-	args[argc++] = p = e;
-      }
-
-      int result = main_func (argc, args);
-      fprintf (stdout, result == 0 ? "success\n" : "failure\n");
-      fflush (stdout);
-      ret |= result;
-    }
-    return ret;
-  }
-
-  return main_func (argc, argv);
 }