------------------------------------------------------------

revno: 12695

revision-id: squid3@treenet.co.nz-20160420064259-k9dn77q0xna1doax

parent: squid3@treenet.co.nz-20160330141606-19rqzzip0grq9a77

committer: Amos Jeffries <squid3@treenet.co.nz>

branch nick: 3.3

timestamp: Wed 2016-04-20 18:42:59 +1200

message:

  cachemgr.cgi: use dynamic MemBuf for internal content generation

  Using a fixed size buffer limits how big content lines can be. Modern

  HTTP is fast reaching the point where such limits are problematic.

  Also fixes incorrect uses of snprintf() by removing them.

------------------------------------------------------------

# Bazaar merge directive format 2 (Bazaar 0.90)

# revision_id: squid3@treenet.co.nz-20160420064259-k9dn77q0xna1doax

# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3

# testament_sha1: 0c7cd2d0ababe794c0fd5b1dc94c647c064c122d

# timestamp: 2016-04-20 06:50:48 +0000

# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3

# base_revision_id: squid3@treenet.co.nz-20160330141606-\

#   19rqzzip0grq9a77

# 

# Begin patch

=== modified file 'src/tests/Stub.list'

--- src/tests/Stub.list	2014-10-08 15:31:39 +0000

+++ src/tests/Stub.list	2016-04-20 06:42:59 +0000

@@ -3,6 +3,7 @@

 	tests/stub_acl.cc \

 	tests/stub_cache_cf.cc \

 	tests/stub_cache_manager.cc \

+	tests/stub_cbdata.cc \

 	tests/stub_client_db.cc \

 	tests/stub_client_side_request.cc \

 	tests/stub_comm.cc \

=== added file 'src/tests/stub_cbdata.cc'

--- src/tests/stub_cbdata.cc	1970-01-01 00:00:00 +0000

+++ src/tests/stub_cbdata.cc	2016-04-20 06:42:59 +0000

@@ -0,0 +1,30 @@

+#include "squid.h"

+#include "cbdata.h"

+

+#define STUB_API "cbdata.cc"

+#include "tests/STUB.h"

+

+void cbdataRegisterWithCacheManager(void) STUB

+void *cbdataInternalAlloc(cbdata_type type, const char *, int sz) {

+    return xcalloc(1, sz);

+}

+void *cbdataInternalFree(void *p, const char *, int) {

+    xfree(p);

+    return nullptr;

+}

+#if USE_CBDATA_DEBUG

+void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)

+void *cbdataInternalFreeDbg(void *p, const char *, int) STUB_RETVAL(NULL)

+void cbdataInternalLockDbg(const void *p, const char *, int) STUB

+void cbdataInternalUnlockDbg(const void *p, const char *, int) STUB

+int cbdataInternalReferenceDoneValidDbg(void **p, void **tp, const char *, int) STUB_RETVAL(0)

+#else

+void *cbdataInternalAlloc(cbdata_type type) STUB_RETVAL(NULL)

+void *cbdataInternalFree(void *p) STUB_RETVAL(NULL)

+void cbdataInternalLock(const void *p) STUB

+void cbdataInternalUnlock(const void *p) STUB

+int cbdataInternalReferenceDoneValid(void **p, void **tp) STUB_RETVAL(0)

+#endif

+

+int cbdataReferenceValid(const void *p) STUB_RETVAL(0)

+cbdata_type cbdataInternalAddType(cbdata_type type, const char *label, int size, FREE * free_func) STUB_RETVAL(CBDATA_UNKNOWN)

=== modified file 'src/tests/stub_mem.cc'

--- src/tests/stub_mem.cc	2012-08-29 07:29:35 +0000

+++ src/tests/stub_mem.cc	2016-04-20 06:42:59 +0000

@@ -5,7 +5,7 @@

 #include "squid.h"

 #define STUB_API "stub_mem.cc"

-#include "STUB.h"

+#include "tests/STUB.h"

 #include "Mem.h"

 void

=== modified file 'tools/Makefile.am'

--- tools/Makefile.am	2010-12-06 14:06:06 +0000

+++ tools/Makefile.am	2016-04-20 06:42:59 +0000

@@ -34,15 +34,24 @@

 stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc

 	cp $(top_srcdir)/src/tests/stub_debug.cc .

+MemBuf.cc: $(top_srcdir)/src/MemBuf.cc

+	cp $(top_srcdir)/src/MemBuf.cc $@

+

 time.cc: $(top_srcdir)/src/time.cc

 	cp $(top_srcdir)/src/time.cc .

+stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc

+	cp $(top_srcdir)/src/tests/stub_cbdata.cc $@

+

+stub_mem.cc: $(top_srcdir)/src/tests/stub_mem.cc

+	cp $(top_srcdir)/src/tests/stub_mem.cc $@

+

 # stock tools for unit tests - library independent versions of dlink_list

 # etc.

 # globals.cc is needed by test_tools.cc.

 # Neither of these should be disted from here.

 TESTSOURCES= test_tools.cc

-CLEANFILES += test_tools.cc stub_debug.cc time.cc

+CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_mem.cc

 ## ##### helper-mux #####

@@ -73,7 +82,10 @@

 libexec_PROGRAMS = cachemgr$(CGIEXT)

 cachemgr__CGIEXT__SOURCES = cachemgr.cc \

+	MemBuf.cc \

+	stub_cbdata.cc \

 	stub_debug.cc \

+	stub_mem.cc \

 	test_tools.cc \

 	time.cc

=== modified file 'tools/cachemgr.cc'

--- tools/cachemgr.cc	2013-09-09 07:17:19 +0000

+++ tools/cachemgr.cc	2016-04-20 06:42:59 +0000

@@ -35,6 +35,7 @@

 #include "getfullhostname.h"

 #include "html_quote.h"

 #include "ip/Address.h"

+#include "MemBuf.h"

 #include "rfc1123.h"

 #include "rfc1738.h"

 #include "util.h"

@@ -460,8 +461,8 @@

     return url;

 }

-static const char *

-munge_menu_line(const char *buf, cachemgr_request * req)

+static void

+munge_menu_line(MemBuf &out, const char *buf, cachemgr_request * req)

 {

     char *x;

     const char *a;

@@ -469,15 +470,14 @@

     const char *p;

     char *a_url;

     char *buf_copy;

-    static char html[2 * 1024];

-

-    if (strlen(buf) < 1)

-        return buf;

-

-    if (*buf != ' ')

-        return buf;

-

-    buf_copy = x = xstrdup(buf);

+

+    const char bufLen = strlen(buf);

+    if (bufLen < 1 || *buf != ' ') {

+        out.append(buf, bufLen);

+        return;

+    }

+

+    buf_copy = x = xstrndup(buf, bufLen);

     a = xstrtok(&x, '\t');

@@ -489,59 +489,56 @@

     /* no reason to give a url for a disabled action */

     if (!strcmp(p, "disabled"))

-        snprintf(html, sizeof(html), "
%s (disabled).\n", d, a_url);

+        out.Printf("
%s (disabled).\n", d, a_url);

     else

         /* disable a hidden action (requires a password, but password is not in squid.conf) */

         if (!strcmp(p, "hidden"))

-            snprintf(html, sizeof(html), "
%s (hidden).\n", d, a_url);

+            out.Printf("
%s (hidden).\n", d, a_url);

         else

             /* disable link if authentication is required and we have no password */

             if (!strcmp(p, "protected") && !req->passwd)

-                snprintf(html, sizeof(html), "
%s (requires authentication).\n",

-                         d, menu_url(req, "authenticate"), a_url);

+                out.Printf("
%s (requires authentication).\n",

+                           d, menu_url(req, "authenticate"), a_url);

             else

                 /* highlight protected but probably available entries */

                 if (!strcmp(p, "protected"))

-                    snprintf(html, sizeof(html), "
<font color=\"#FF0000\">%s</font>\n",

-                             a_url, d);

+                    out.Printf("
<font color=\"#FF0000\">%s</font>\n",

+                               a_url, d);

     /* public entry or unknown type of protection */

                 else

-                    snprintf(html, sizeof(html), "
%s\n", a_url, d);

+                    out.Printf("
%s\n", a_url, d);

     xfree(a_url);

     xfree(buf_copy);

-

-    return html;

 }

-static const char *

-munge_other_line(const char *buf, cachemgr_request * req)

+static void

+munge_other_line(MemBuf &out, const char *buf, cachemgr_request *)

 {

     static const char *ttags[] = {"td", "th"};

-    static char html[4096];

     static int table_line_num = 0;

     static int next_is_header = 0;

     int is_header = 0;

     const char *ttag;

     char *buf_copy;

     char *x, *p;

-    int l = 0;

     /* does it look like a table? */

     if (!strchr(buf, '\t') || *buf == '\t') {

         /* nope, just text */

-        snprintf(html, sizeof(html), "%s%s",

-                 table_line_num ? "\n
" : "", html_quote(buf));

+        if (table_line_num)

+            out.append("\n
", 14);

+        out.Printf("%s", html_quote(buf));

         table_line_num = 0;

-        return html;

+        return;

     }

     /* start html table */

     if (!table_line_num) {

-        l += snprintf(html + l, sizeof(html) - l, "\n");

+        out.append("\n", 46);

         next_is_header = 0;

     }

@@ -551,7 +548,7 @@

     ttag = ttags[is_header];

     /* record starts */

-    l += snprintf(html + l, sizeof(html) - l, "");

+    out.append("", 4);

     /* substitute '\t' */

     buf_copy = x = xstrdup(buf);

@@ -568,18 +565,17 @@

             ++x;

         }

-        l += snprintf(html + l, sizeof(html) - l, "<%s colspan=\"%d\" align=\"%s\">%s</%s>",

-                      ttag, column_span,

-                      is_header ? "center" : is_number(cell) ? "right" : "left",

-                      html_quote(cell), ttag);

+        out.Printf("<%s colspan=\"%d\" align=\"%s\">%s</%s>",

+                   ttag, column_span,

+                   is_header ? "center" : is_number(cell) ? "right" : "left",

+                   html_quote(cell), ttag);

     }

     xfree(buf_copy);

     /* record ends */

-    snprintf(html + l, sizeof(html) - l, "\n");

+    out.append("\n", 6);

     next_is_header = is_header && strstr(buf, "\t\t");

     ++table_line_num;

-    return html;

 }

 static const char *

@@ -736,14 +732,18 @@

             /* yes, fall through, we do not want to loose the first line */

         case isBody:

+        {

             /* interpret [and reformat] cache response */

-

+            MemBuf out;

+            out.init();

             if (parse_menu)

-                fputs(munge_menu_line(buf, req), stdout);

+                munge_menu_line(out, buf, req);

             else

-                fputs(munge_other_line(buf, req), stdout);

+                munge_other_line(out, buf, req);

-            break;

+            fputs(out.buf, stdout);

+        }

+        break;

         case isForward:

             /* forward: no modifications allowed */

------------------------------------------------------------

revno: 12696

revision-id: squid3@treenet.co.nz-20160420101500-nm50i4u3iftemzs6

parent: squid3@treenet.co.nz-20160420064259-k9dn77q0xna1doax

committer: Amos Jeffries <squid3@treenet.co.nz>

branch nick: 3.3

timestamp: Wed 2016-04-20 22:15:00 +1200

message:

  nullptr is a C++11 feature

------------------------------------------------------------

# Bazaar merge directive format 2 (Bazaar 0.90)

# revision_id: squid3@treenet.co.nz-20160420101500-nm50i4u3iftemzs6

# target_branch: http://bzr.squid-cache.org/bzr/squid3/3.3

# testament_sha1: 091f2aa4b835390972c0f42e67128484d653c2ee

# timestamp: 2016-04-20 10:50:54 +0000

# source_branch: http://bzr.squid-cache.org/bzr/squid3/3.3

# base_revision_id: squid3@treenet.co.nz-20160420064259-\

#   k9dn77q0xna1doax

# 

# Begin patch

=== modified file 'src/tests/stub_cbdata.cc'

--- src/tests/stub_cbdata.cc	2016-04-20 06:42:59 +0000

+++ src/tests/stub_cbdata.cc	2016-04-20 10:15:00 +0000

@@ -10,7 +10,7 @@

 }

 void *cbdataInternalFree(void *p, const char *, int) {

     xfree(p);

-    return nullptr;

+    return NULL;

 }

 #if USE_CBDATA_DEBUG

 void *cbdataInternalAllocDbg(cbdata_type type, const char *, int) STUB_RETVAL(NULL)

diff --git tools/Makefile.in tools/Makefile.in

index 7380540..1c951fc 100644

--- tools/Makefile.in

+++ tools/Makefile.in

@@ -1,9 +1,8 @@

-# Makefile.in generated by automake 1.11.1 from Makefile.am.

+# Makefile.in generated by automake 1.15 from Makefile.am.

 # @configure_input@

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,

-# Inc.

+# Copyright (C) 1994-2014 Free Software Foundation, Inc.

+

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -23,6 +22,61 @@

 VPATH = @srcdir@

+am__is_gnu_make = { \

+  if test -z '$(MAKELEVEL)'; then \

+    false; \

+  elif test -n '$(MAKE_HOST)'; then \

+    true; \

+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \

+    true; \

+  else \

+    false; \

+  fi; \

+}

+am__make_running_with_option = \

+  case $${target_option-} in \

+      ?) ;; \

+      *) echo "am__make_running_with_option: internal error: invalid" \

+              "target option '$${target_option-}' specified" >&2; \

+         exit 1;; \

+  esac; \

+  has_opt=no; \

+  sane_makeflags=$$MAKEFLAGS; \

+  if $(am__is_gnu_make); then \

+    sane_makeflags=$$MFLAGS; \

+  else \

+    case $$MAKEFLAGS in \

+      *\\[\ \	]*) \

+        bs=\\; \

+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \

+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \

+    esac; \

+  fi; \

+  skip_next=no; \

+  strip_trailopt () \

+  { \

+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \

+  }; \

+  for flg in $$sane_makeflags; do \

+    test $$skip_next = yes && { skip_next=no; continue; }; \

+    case $$flg in \

+      *=*|--*) continue;; \

+        -*I) strip_trailopt 'I'; skip_next=yes;; \

+      -*I?*) strip_trailopt 'I';; \

+        -*O) strip_trailopt 'O'; skip_next=yes;; \

+      -*O?*) strip_trailopt 'O';; \

+        -*l) strip_trailopt 'l'; skip_next=yes;; \

+      -*l?*) strip_trailopt 'l';; \

+      -[dEDm]) skip_next=yes;; \

+      -[JT]) skip_next=yes;; \

+    esac; \

+    case $$flg in \

+      *$$target_option*) has_opt=yes; break;; \

+    esac; \

+  done; \

+  test $$has_opt = yes

+am__make_dryrun = (target_option=n; $(am__make_running_with_option))

+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))

 pkgdatadir = $(datadir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

@@ -41,9 +95,6 @@ PRE_UNINSTALL = :

 POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \

-	$(top_srcdir)/doc/manuals/Substitute.am \

-	$(top_srcdir)/src/Common.am

 check_PROGRAMS =

 TESTS =

 @USE_LOADABLE_MODULES_TRUE@am__append_1 = $(INCLTDL)

@@ -63,6 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude/init.m4 \

 	$(top_srcdir)/configure.ac

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)

 mkinstalldirs = $(install_sh) -d

 CONFIG_HEADER = $(top_builddir)/include/autoconf.h

 CONFIG_CLEAN_FILES =

@@ -72,7 +124,10 @@ am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \

 	"$(DESTDIR)$(man8dir)"

 PROGRAMS = $(bin_PROGRAMS) $(libexec_PROGRAMS)

 am_cachemgr__CGIEXT__OBJECTS = cachemgr__CGIEXT_-cachemgr.$(OBJEXT) \

+	cachemgr__CGIEXT_-MemBuf.$(OBJEXT) \

+	cachemgr__CGIEXT_-stub_cbdata.$(OBJEXT) \

 	cachemgr__CGIEXT_-stub_debug.$(OBJEXT) \

+	cachemgr__CGIEXT_-stub_mem.$(OBJEXT) \

 	cachemgr__CGIEXT_-test_tools.$(OBJEXT) \

 	cachemgr__CGIEXT_-time.$(OBJEXT)

 cachemgr__CGIEXT__OBJECTS = $(am_cachemgr__CGIEXT__OBJECTS)

@@ -84,8 +139,12 @@ cachemgr__CGIEXT__DEPENDENCIES = $(top_builddir)/src/ip/libip.la \

 	$(top_builddir)/lib/libmiscencoding.la \

 	$(top_builddir)/lib/libmiscutil.la $(am__DEPENDENCIES_2) \

 	$(am__DEPENDENCIES_3) $(am__DEPENDENCIES_3)

-cachemgr__CGIEXT__LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \

-	$(LIBTOOLFLAGS) --mode=link $(CXXLD) \

+AM_V_lt = $(am__v_lt_@AM_V@)

+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)

+am__v_lt_0 = --silent

+am__v_lt_1 = 

+cachemgr__CGIEXT__LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \

+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CXXLD) \

 	$(cachemgr__CGIEXT__CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \

 	$(LDFLAGS) -o $@

 am_squidclient_OBJECTS = squidclient.$(OBJEXT) stub_debug.$(OBJEXT) \

@@ -117,43 +176,272 @@ am__nobase_list = $(am__nobase_strip_setup); \

 am__base_list = \

   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \

   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'

+am__uninstall_files_from_dir = { \

+  test -z "$$files" \

+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \

+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \

+         $(am__cd) "$$dir" && rm -f $$files; }; \

+  }

 SCRIPTS = $(libexec_SCRIPTS)

+AM_V_P = $(am__v_P_@AM_V@)

+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

+am__v_P_0 = false

+am__v_P_1 = :

+AM_V_GEN = $(am__v_GEN_@AM_V@)

+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)

+am__v_GEN_0 = @echo "  GEN     " $@;

+am__v_GEN_1 = 

+AM_V_at = $(am__v_at_@AM_V@)

+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)

+am__v_at_0 = @

+am__v_at_1 = 

 DEFAULT_INCLUDES = 

 depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp

 am__depfiles_maybe = depfiles

 am__mv = mv -f

 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

-	--mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \

+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \

+	$(AM_CXXFLAGS) $(CXXFLAGS)

+AM_V_CXX = $(am__v_CXX_@AM_V@)

+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)

+am__v_CXX_0 = @echo "  CXX     " $@;

+am__v_CXX_1 = 

 CXXLD = $(CXX)

-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \

-	--mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \

-	$(LDFLAGS) -o $@

+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \

+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \

+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@

+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)

+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)

+am__v_CXXLD_0 = @echo "  CXXLD   " $@;

+am__v_CXXLD_1 = 

 SOURCES = $(cachemgr__CGIEXT__SOURCES) $(squidclient_SOURCES)

 DIST_SOURCES = $(cachemgr__CGIEXT__SOURCES) $(squidclient_SOURCES)

-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

-	html-recursive info-recursive install-data-recursive \

-	install-dvi-recursive install-exec-recursive \

-	install-html-recursive install-info-recursive \

-	install-pdf-recursive install-ps-recursive install-recursive \

-	installcheck-recursive installdirs-recursive pdf-recursive \

-	ps-recursive uninstall-recursive

+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \

+	ctags-recursive dvi-recursive html-recursive info-recursive \

+	install-data-recursive install-dvi-recursive \

+	install-exec-recursive install-html-recursive \

+	install-info-recursive install-pdf-recursive \

+	install-ps-recursive install-recursive installcheck-recursive \

+	installdirs-recursive pdf-recursive ps-recursive \

+	tags-recursive uninstall-recursive

+am__can_run_installinfo = \

+  case $$AM_UPDATE_INFO_DIR in \

+    n|no|NO) false;; \

+    *) (install-info --version) >/dev/null 2>&1;; \

+  esac

 man1dir = $(mandir)/man1

 man8dir = $(mandir)/man8

 NROFF = nroff

 MANS = $(man_MANS)

 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

   distclean-recursive maintainer-clean-recursive

-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \

-	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \

-	distdir

+am__recursive_targets = \

+  $(RECURSIVE_TARGETS) \

+  $(RECURSIVE_CLEAN_TARGETS) \

+  $(am__extra_recursive_targets)

+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \

+	check recheck distdir

+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)

+# Read a list of newline-separated strings from the standard input,

+# and print each of them once, without duplicates.  Input order is

+# *not* preserved.

+am__uniquify_input = $(AWK) '\

+  BEGIN { nonempty = 0; } \

+  { items[$$0] = 1; nonempty = 1; } \

+  END { if (nonempty) { for (i in items) print i; }; } \

+'

+# Make sure the list of sources is unique.  This is necessary because,

+# e.g., the same source file might be shared among _SOURCES variables

+# for different programs/libraries.

+am__define_uniq_tagged_files = \

+  list='$(am__tagged_files)'; \

+  unique=`for i in $$list; do \

+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \

+  done | $(am__uniquify_input)`

 ETAGS = etags

 CTAGS = ctags

-am__tty_colors = \

-red=; grn=; lgn=; blu=; std=

+am__tty_colors_dummy = \

+  mgn= red= grn= lgn= blu= brg= std=; \

+  am__color_tests=no

+am__tty_colors = { \

+  $(am__tty_colors_dummy); \

+  if test "X$(AM_COLOR_TESTS)" = Xno; then \

+    am__color_tests=no; \

+  elif test "X$(AM_COLOR_TESTS)" = Xalways; then \

+    am__color_tests=yes; \

+  elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \

+    am__color_tests=yes; \

+  fi; \

+  if test $$am__color_tests = yes; then \

+    red='?[0;31m'; \

+    grn='?[0;32m'; \

+    lgn='?[1;32m'; \

+    blu='?[1;34m'; \

+    mgn='?[0;35m'; \

+    brg='?[1m'; \

+    std='?[m'; \

+  fi; \

+}

+am__recheck_rx = ^[ 	]*:recheck:[ 	]*

+am__global_test_result_rx = ^[ 	]*:global-test-result:[ 	]*

+am__copy_in_global_log_rx = ^[ 	]*:copy-in-global-log:[ 	]*

+# A command that, given a newline-separated list of test names on the

+# standard input, print the name of the tests that are to be re-run

+# upon "make recheck".

+am__list_recheck_tests = $(AWK) '{ \

+  recheck = 1; \

+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \

+    { \

+      if (rc < 0) \

+        { \

+          if ((getline line2 < ($$0 ".log")) < 0) \

+	    recheck = 0; \

+          break; \

+        } \

+      else if (line ~ /$(am__recheck_rx)[nN][Oo]/) \

+        { \

+          recheck = 0; \

+          break; \

+        } \

+      else if (line ~ /$(am__recheck_rx)[yY][eE][sS]/) \

+        { \

+          break; \

+        } \

+    }; \

+  if (recheck) \

+    print $$0; \

+  close ($$0 ".trs"); \

+  close ($$0 ".log"); \

+}'

+# A command that, given a newline-separated list of test names on the

+# standard input, create the global log from their .trs and .log files.

+am__create_global_log = $(AWK) ' \

+function fatal(msg) \

+{ \

+  print "fatal: making $@: " msg | "cat >&2;; \

+  exit 1; \

+} \

+function rst_section(header) \

+{ \

+  print header; \

+  len = length(header); \

+  for (i = 1; i <= len; i = i + 1) \

+    printf "="; \

+  printf "\n\n"; \

+} \

+{ \

+  copy_in_global_log = 1; \

+  global_test_result = "RUN"; \

+  while ((rc = (getline line < ($$0 ".trs"))) != 0) \

+    { \

+      if (rc < 0) \

+         fatal("failed to read from " $$0 ".trs"); \

+      if (line ~ /$(am__global_test_result_rx)/) \

+        { \

+          sub("$(am__global_test_result_rx)", "", line); \

+          sub("[ 	]*$$", "", line); \

+          global_test_result = line; \

+        } \

+      else if (line ~ /$(am__copy_in_global_log_rx)[nN][oO]/) \

+        copy_in_global_log = 0; \

+    }; \

+  if (copy_in_global_log) \

+    { \

+      rst_section(global_test_result ": " $$0); \

+      while ((rc = (getline line < ($$0 ".log"))) != 0) \

+      { \

+        if (rc < 0) \

+          fatal("failed to read from " $$0 ".log"); \

+        print line; \

+      }; \

+      printf "\n"; \

+    }; \

+  close ($$0 ".trs"); \

+  close ($$0 ".log"); \

+}'

+# Restructured Text title.

+am__rst_title = { sed 's/.*/   &   /;h;s/./=/g;p;x;s/ *$$//;p;g' && echo; }

+# Solaris 10 'make', and several other traditional 'make' implementations,

+# pass "-e" to $(SHELL), and POSIX 2008 even requires this.  Work around it

+# by disabling -e (using the XSI extension "set +e") if it's set.

+am__sh_e_setup = case $$- in *e*) set +e;; esac

+# Default flags passed to test drivers.

+am__common_driver_flags = \

+  --color-tests "$$am__color_tests" \

+  --enable-hard-errors "$$am__enable_hard_errors" \

+  --expect-failure "$$am__expect_failure"

+# To be inserted before the command running the test.  Creates the

+# directory for the log if needed.  Stores in $dir the directory

+# containing $f, in $tst the test, in $log the log.  Executes the

+# developer- defined test setup AM_TESTS_ENVIRONMENT (if any), and

+# passes TESTS_ENVIRONMENT.  Set up options for the wrapper that

+# will run the test scripts (or their associated LOG_COMPILER, if

+# thy have one).

+am__check_pre = \

+$(am__sh_e_setup);					\

+$(am__vpath_adj_setup) $(am__vpath_adj)			\

+$(am__tty_colors);					\

+srcdir=$(srcdir); export srcdir;			\

+case "$@" in						\

+  */*) am__odir=`echo "./$@" | sed 's|/[^/]*$$||'`;;	\

+    *) am__odir=.;; 					\

+esac;							\

+test "x$$am__odir" = x"." || test -d "$$am__odir" 	\

+  || $(MKDIR_P) "$$am__odir" || exit $$?;		\

+if test -f "./$$f"; then dir=./;			\

+elif test -f "$$f"; then dir=;				\

+else dir="$(srcdir)/"; fi;				\

+tst=$$dir$$f; log='$@'; 				\

+if test -n '$(DISABLE_HARD_ERRORS)'; then		\

+  am__enable_hard_errors=no; 				\

+else							\

+  am__enable_hard_errors=yes; 				\

+fi; 							\

+case " $(XFAIL_TESTS) " in				\

+  *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \

+    am__expect_failure=yes;;				\

+  *)							\

+    am__expect_failure=no;;				\

+esac; 							\

+$(AM_TESTS_ENVIRONMENT) $(TESTS_ENVIRONMENT)

+# A shell command to get the names of the tests scripts with any registered

+# extension removed (i.e., equivalently, the names of the test logs, with

+# the '.log' extension removed).  The result is saved in the shell variable

+# '$bases'.  This honors runtime overriding of TESTS and TEST_LOGS.  Sadly,

+# we cannot use something simpler, involving e.g., "$(TEST_LOGS:.log=)",

+# since that might cause problem with VPATH rewrites for suffix-less tests.

+# See also 'test-harness-vpath-rewrite.sh' and 'test-trs-basic.sh'.