Merge pull request #3564 from masatake/pull-subtrees

Pull the subtrees  (packcc and libreadtags)

Author: masatake

libreadtags/.github/workflows/msys2.yml

@@ -50,3 +50,5 @@ jobs:
     - run: make check V=1
     - run: cat tests/test-suite.log
       if: failure()
+    - run: for x in tests/*.log; do echo '#' $x; cat $x; done
+      if: failure()

libreadtags/NEWS.md

@@ -1,4 +1,12 @@
-# Version ???
+# Version 0.2.1
+
+- use "m" mode flag of fopen only when compiling with glibc 2.3 or higher.
+
+- LT_VERSION 2:1:1
+
+	- no change in public interface
+
+# Version 0.2.0
 
 - delete debug output automatically printed when DEBUG is defiend in
   build-time.
@@ -20,6 +28,15 @@
 - add a new API function (tagsFindPseudoTag) for finding a pseudo tag for
   given name.
 
+- Use mmap(2) when opening a tags file if fopen() supports "m" mode flag.
+
+- LT_VERSION 2:0:1
+
+	- extend the API
+
+		- add a constant: TagErrnoFileMaybeTooBig
+		- add a function: tagsFindPseudoTag
+
 # Version 0.1.0
 
 - propagate internal errors to caller

libreadtags/configure.ac

@@ -1,5 +1,5 @@
 # -*- Autoconf -*-
-AC_INIT(libreadtags, 0.1.0)
+AC_INIT(libreadtags, 0.2.1)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_SRCDIR([readtags.c])
 
@@ -27,8 +27,12 @@ AC_PROG_LIBTOOL
 #
 # 2:0:1
 #    introduced TagErrnoFileMayTooBig.
+#    introduced tagsFindPseudoTag.
 #
-AC_SUBST(LT_VERSION, [2:0:1])
+# 2:1:1
+#    no change in public interface.
+#
+AC_SUBST(LT_VERSION, [2:1:1])
 
 AC_ARG_ENABLE([gcov],
 	[AS_HELP_STRING([--enable-gcov],

libreadtags/readtags.c

@@ -832,7 +832,16 @@ static tagFile *initialize (const char *const filePath, tagFileInfo *const info)
 		result->fields.max, sizeof (tagExtensionField));
 	if (result->fields.list == NULL)
 		goto mem_error;
-	result->fp = fopen (filePath, "rb");
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2) \
+	&& defined(__GLIBC_MINOR__) && (__GLIBC_MINOR__ >= 3)
+	result->fp = fopen (filePath, "rbm");
+#endif
+	if (result->fp == NULL)
+	{
+		errno = 0;
+		result->fp = fopen (filePath, "rb");
+	}
 	if (result->fp == NULL)
 	{
 		info->status.error_number = errno;

misc/packcc/src/packcc.c

@@ -1681,7 +1681,7 @@ static void dump_node(context_t *ctx, const node_t *node, const int indent) {
         fprintf(stdout, "')\n");
         break;
     case NODE_QUANTITY:
-        fprintf(stdout, "%*sQuantity(min:%d, max%d) {\n", indent, "", node->data.quantity.min, node->data.quantity.max);
+        fprintf(stdout, "%*sQuantity(min:%d, max:%d) {\n", indent, "", node->data.quantity.min, node->data.quantity.max);
         dump_node(ctx, node->data.quantity.expr, indent + 2);
         fprintf(stdout, "%*s}\n", indent, "");
         break;

misc/packcc/tests/dump.d/expected.txt

@@ -10,7 +10,7 @@ Rule(name:'statement', ref:0, vars.len:1, capts.len:0, codes.len:2) {
       )
     }
     Sequence(max:4, len:3) {
-      Quantity(min:0, max-1) {
+      Quantity(min:0, max:-1) {
         Sequence(max:2, len:2) {
           Predicate(neg:1) {
             Reference(var:'(null)', index:void, name:'EOL', rule:'EOL')
@@ -125,7 +125,7 @@ Rule(name:'primary', ref:1, vars.len:1, capts.len:1, codes.len:2) {
   Alternate(max:2, len:2) {
     Sequence(max:2, len:2) {
       Capture(index:0) {
-        Quantity(min:1, max-1) {
+        Quantity(min:1, max:-1) {
           Charclass(value:'0-9')
         }
       }
@@ -146,7 +146,7 @@ Rule(name:'primary', ref:1, vars.len:1, capts.len:1, codes.len:2) {
   }
 }
 Rule(name:'_', ref:14, vars.len:0, capts.len:0, codes.len:0) {
-  Quantity(min:0, max-1) {
+  Quantity(min:0, max:-1) {
     Charclass(value:' \t')
   }
 }