From 3b69f134671e60eb5de0ca895177064294b6eb78 Mon Sep 17 00:00:00 2001
From: Thomas Guyot-Sionnest <dermoth@aei.ca>
Date: Tue, 20 Jan 2009 23:55:34 -0500
Subject: [PATCH] Some platform are missing setenv

Instead of adding the gnulib module for solving tests only I split the test
in two, setting environment from Perl for the later.
---
 configure.in                            |   2 +-
 lib/tests/Makefile.am                   |   6 +-
 lib/tests/test_opts.t                   |   6 -
 lib/tests/test_opts1                    | Bin 0 -> 34139 bytes
 lib/tests/{test_opts.c => test_opts1.c} |  90 +-------------
 lib/tests/test_opts1.t                  |   6 +
 lib/tests/test_opts2                    | Bin 0 -> 35227 bytes
 lib/tests/test_opts2.c                  | 151 ++++++++++++++++++++++++
 lib/tests/test_opts2.t                  |   7 ++
 9 files changed, 169 insertions(+), 99 deletions(-)
 delete mode 100755 lib/tests/test_opts.t
 create mode 100755 lib/tests/test_opts1
 rename lib/tests/{test_opts.c => test_opts1.c} (61%)
 create mode 100755 lib/tests/test_opts1.t
 create mode 100755 lib/tests/test_opts2
 create mode 100644 lib/tests/test_opts2.c
 create mode 100755 lib/tests/test_opts2.t

diff --git a/configure.in b/configure.in
index eb27d6a..107cfd9 100644
--- a/configure.in
+++ b/configure.in
@@ -188,7 +188,7 @@ AM_CONDITIONAL([USE_PARSE_INI],[test "$enable_extra_opts" = "yes"])
 if test "$enable_extra_opts" = "yes" ; then
 	AC_DEFINE(NP_EXTRA_OPTS,[1],[Enable INI file parsing.])
 	if test "$enable_libtap" = "yes"; then
-		EXTRA_TEST="$EXTRA_TEST test_ini test_opts"
+		EXTRA_TEST="$EXTRA_TEST test_ini test_opts1 test_opts2"
 		AC_SUBST(EXTRA_TEST)
 	fi
 fi
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index a59a653..f36c0be 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -7,9 +7,9 @@ check_PROGRAMS = @EXTRA_TEST@
 
 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
 
-EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts
+EXTRA_PROGRAMS = test_utils test_disk test_tcp test_cmd test_base64 test_ini test_opts1 test_opts2
 
-np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts.t test_tcp.t test_utils.t
+np_test_scripts = test_base64.t test_cmd.t test_disk.t test_ini.t test_opts1.t test_opts2.t test_tcp.t test_utils.t
 np_test_files = config-dos.ini config-opts.ini config-tiny.ini plugin.ini plugins.ini
 EXTRA_DIST = $(np_test_scripts) $(np_test_files)
 
@@ -28,7 +28,7 @@ AM_CFLAGS = -g -I$(top_srcdir)/lib -I$(top_srcdir)/gl $(tap_cflags)
 AM_LDFLAGS = $(tap_ldflags) -ltap
 LDADD = $(top_srcdir)/lib/libnagiosplug.a $(top_srcdir)/gl/libgnu.a
 
-SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts.c
+SOURCES = test_utils.c test_disk.c test_tcp.c test_cmd.c test_base64.c test_ini.c test_opts1.c test_opts2.c
 
 test: ${noinst_PROGRAMS}
 	perl -MTest::Harness -e '$$Test::Harness::switches=""; runtests(map {$$_ .= ".t"} @ARGV)' $(EXTRA_PROGRAMS)
diff --git a/lib/tests/test_opts.t b/lib/tests/test_opts.t
deleted file mode 100755
index d69b8f1..0000000
--- a/lib/tests/test_opts.t
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/perl
-use Test::More;
-if (! -e "./test_opts") {
-	plan skip_all => "./test_opts not compiled - please install tap library and/or enable parse-ini to test";
-}
-exec "./test_opts";
diff --git a/lib/tests/test_opts1 b/lib/tests/test_opts1
new file mode 100755
index 0000000000000000000000000000000000000000..cab0f2a0e54efef62bbefa1525dff77117851a15
GIT binary patch
literal 34139
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

literal 0
HcmV?d00001

diff --git a/lib/tests/test_opts.c b/lib/tests/test_opts1.c
similarity index 61%
rename from lib/tests/test_opts.c
rename to lib/tests/test_opts1.c
index ad9a854..ea98403 100644
--- a/lib/tests/test_opts.c
+++ b/lib/tests/test_opts1.c
@@ -57,7 +57,7 @@ main (int argc, char **argv)
 	char **argv_test=NULL, **argv_known=NULL;
 	int i, argc_test;
 
-	plan_tests(10);
+	plan_tests(5);
 
 	argv_test=(char **)malloc(2*sizeof(char **));
 	argv_test[0] = "prog_name";
@@ -201,94 +201,6 @@ main (int argc, char **argv)
 	ok(array_diff(argc_test, argv_test, 4, argv_known), "Missing section 3");
 	my_free(&argc_test,argv_test); */
 
-	setenv("NAGIOS_CONFIG_PATH", ".", 1);
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts";
-	argv_test[3] = "--arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = "arg1";
-	argv_known[3] = "--arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1");
-
-	argv_test=(char **)malloc(3*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "--extra-opts";
-	argv_test[2] = NULL;
-	argc_test=2;
-	argv_known=(char **)realloc(argv_known, 3*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 2, argv_known), "Default section 2");
-	my_free(&argc_test,argv_test);
-
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts=section1";
-	argv_test[3] = "--arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foobar=baz";
-	argv_known[2] = "arg1";
-	argv_known[3] = "--arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3");
-	my_free(&argc_test,argv_test);
-
-	argv_test=(char **)malloc(6*sizeof(char **));
-	argv_test[0] = "prog_name";
-	argv_test[1] = "arg1";
-	argv_test[2] = "--extra-opts";
-	argv_test[3] = "-arg3";
-	argv_test[4] = "val2";
-	argv_test[5] = NULL;
-	argc_test=5;
-	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
-	argv_known[0] = "prog_name";
-	argv_known[1] = "--foo=bar";
-	argv_known[2] = "arg1";
-	argv_known[3] = "-arg3";
-	argv_known[4] = "val2";
-	argv_known[5] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
-	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 4");
-	my_free(&argc_test,argv_test);
-
-	argv_test=(char **)malloc(4*sizeof(char **));
-	argv_test[0] = "check_tcp";
-	argv_test[1] = "--extra-opts";
-	argv_test[2] = "--extra-opts=tcp_long_lines";
-	argv_test[3] = NULL;
-	argc_test=3;
-	argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
-	argv_known[0] = "check_tcp";
-	argv_known[1] = "--timeout=10";
-	argv_known[2] = "--escape";
-	argv_known[3] = "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
-	argv_known[4] = "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
-	argv_known[5] = "--jail";
-	argv_known[6] = NULL;
-	argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
-	ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
-	my_free(&argc_test,argv_test);
-
 	return exit_status();
 }
 
diff --git a/lib/tests/test_opts1.t b/lib/tests/test_opts1.t
new file mode 100755
index 0000000..52eed94
--- /dev/null
+++ b/lib/tests/test_opts1.t
@@ -0,0 +1,6 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_opts1") {
+	plan skip_all => "./test_opts1 not compiled - please install tap library and/or enable parse-ini to test";
+}
+exec "./test_opts1";
diff --git a/lib/tests/test_opts2 b/lib/tests/test_opts2
new file mode 100755
index 0000000000000000000000000000000000000000..226fe9190cec87f2bd53b08830c26adba1b2a310
GIT binary patch
literal 35227
zcmeHw3w&HvwfCNxOq)KF(iRG>GNmmvg{Em~p%03amMK#RP@$C~=wzBq+R(hr%=DpF
z9%-<1hiFBsTt2T<eEfR7>aBhv6>Sq9lEU>~gZPMwpW)>_W9l^^XapqR|G)O$lQSo2
z%e|l9{e6$S+nlx6+H0-7_S(<0&z^H`i&U-i`+Uj<zq(uz+dm~NBz;w?cdMX=wp<mf
zu)09aRbxO2;x8;IggRznmr-qDvEd5<7BTKO1b<jZ44kDgWudi@kogUVu!(B8bdyFc
zR4OC{%F)*4CVly)YN1=Wj|L$eH_*z_JjzuYxoRV4p)Hq%wtOrb|7Mx;&GLtV5f2j>
ztA?TY0`v_prD_@9e+{_^!v(O41wpXT%Do$MwDau-Yv-bd`Yo3%UDQy!u%W&wy=&pF
z<(DkHWNCS_xqOM(UkZiH^2%$q1FS!+{5+&B!rxi=n~gtPUx=zRctN-be;43yKK@GZ
z$8fd=Y9inQ6DKIc-#hR(g@_5`0nf7t;Dz`r$KOKyor}L2_@f;RA^gq7-%R}ddjiWf
z;cW<vH9X@0r{Qn1OXeKJ*?deDNs4W&?*ujpe^c>CpW1q3oz21DnfN;&f79_t-_jnI
zk-BufhScqdGmyS@Q=Do}8g@d^`kzb>7|zQ*^!p4w2I%I$+Z19Q=pn=72CSda=(mAB
znx3pD-x8z$?>zit487Sye+D?ibdR1M!(WdycfM>h3^gA9M-Bg8q`CQRyKM9DZxJm@
z{nW#MpV4!Thu`*#w1<9xjzo9?f9`y3z5Llje}l{jAMxn<g~|6>q`CFvgd5|9hyQ9r
zpW~rlYUn*4Jp+b5$-~cf$uNXJcfJYJkpH`f{uweOZ1U)_^)kyte@(NihXLLCHyZlg
z9=dJ()gJnO!+(oM|7=5F?x8;boPq7mo$sKb??jrL{$=6T<BgksiJ>3&@UJy=j*)JD
z_IZZI$j3d_+4l2Wq`CR6Ki7HeOc*=A<l+Cash3AQbgT0f&_~PnYeGL;b#1OjOpiqp
z!93BD+SZzg*K%^GP_e6a#I8?ltxu*Bt!o?N$z&p_>KdABw%64+Bvf6xDIbSqZG)as
zVzI4_%}udnD&Crk#S~I%m~e^O5l^<X);Fc<R9$mRqDduFtxYwJEgH7$RxRmNQf*D7
zQi)wD6{CWh?Xj9|+hcX{`Ua-fY>T%lSl57TAyr#1I+85{YSW@A)m*FUlgXBN4Ge^`
z8o4H!NdxjsHwg_`jh3rzPN!5Im8-@?V-3uxt7&LXCe#jNYopE%Vu_|5FsmlDyCo6Z
z5;Ha=T3c0pQ*C0GE=C;6cDB~15-dm}U0<t`iPV;K9aCA>Sd9KK&S{LJ1Uu@iQ(6-V
z>faTQ#o>Z_`d}BFkWyDxtzWY?wxoPX`LcX`X+Cx_s?IO}Scf`xs%yZ*Q{=*fi1W|=
zkMk4%={YR~m_DZ-Q)5uwYucp`Ga^?Gw!coRug5f4q`ruB(xwU?P+vE=miOo7LpN4~
zOV5F(Nef=#qR$tKzASgqxjwMLwr9@AoIh>YZ1_2^8<Qoe+C}GFY{NDeJz$A|EiSsA
zuXW-s7u~KMm~y*|Zu>mx`&@LcF>KiHqT4Z)Y4^J5?)A$-7oBS?8xFbXT#wjr*hP1*
zX^yz)c8;V>my2%emh|H;x_f--anbD<ME+hEoogc-`dsvBmI&y$=ypzG@_>uZwUiBm
zF8W!PNNC14)(O{-HWa()c8$ukQWu@;JR4@X=rb)5Fyx}U*TnN(bgpx4sBqD_R<vQc
zi_W#K4Ph5OWQl-L7k##izQIL5&qd$tqT4x%$<;3UTo?Z~7u~M8ncU){pYP(|<)UBU
zqTlYKm$~TsT=WGl`hFLk>wg>Wb<ugBVMDa-M6vTr^jv2px~bE?1g>d&y!f%9W!FbT
zYG~d@TuaUkBSw51#d3W^2=lHY&Y>XJBlsHP90GD(g0CdbuAe(B_!8nAnsNsPUqGD0
zOm4s6=Mm?Skh@**bBMFq<yr(kgE)tPT(#iiiH{?`L2y5DcKKXb@Yk;d&aR%T5d0P5
z?BcnQ;J+o#uAM6t{CVQ+(m5sgFNm`%=LX&aVcw63vkT|?1b>P+yKb&W@JETW%jUWS
zf0#JCYVNS$-z3g1nmZ`?SBSG~=JpHz0C9H7-0gzjN1R<T*CO~m#MuRN)q?*Gady4j
z2Ep$n&Mub=3;sdkGl^FS-b$QZEEf{|R^sehxl+Nm5NDUlDZ$@MoLwn5@E4Z<dg3AC
zeS%*_oLwi^BlsHP>@vA7!B-MzSIHd~d<k)Ok=#MS7Z7LH$n6*WJmTjQzg_Tih_fr?
zS_D6XIH#~&HSop1Tc3IQ{n5<x(Y6-{Hf&tq-E}Y=R?+T94h!i1>C~`teg?)@_wQ#L
zk7k26MM5gt-j(tX^+*%n?+&-Ger{a|%kXICrBrGET*!14M>D|(K^*!KgujYNG+P>N
z|55tICxq;K^0B(Q@{)7+!Xyf|tzNVi8mQpRBP21eiJhA_Rjc)x$DXVldf~~(_U~r~
zuqPDF>~W%*bYC<Zak3SiU6o-aLe3}O92)A5yvdH$KPMY`GkS0Ik-k7Q5CLmN=fC9n
zwu7$?e4;?DioAK-k2=}<od=K*&F<-QZbIpq+D&8BlaHCK!<juNm~&>+v(d~oJ=w^K
zRgq^?XLj~NwG)xte?WoUFK~e+68|o)9%ER(^x1A=Pc%zn$==N9+^OlKaHnTx({FaF
zHTm+t!Sag*{Wp8~E8IBzvD}HEjBvB)n4i~iolD1AbQ0uNMNX7_Yy}!Jl+(G{$Pe-^
zsmSbsFVa2H?#KX=(2ODuVJC+tXD$Yj&I-o1LT@w^8Gu&@qTTAcHDM)Dwv}#m(=b{J
z^!>x=44~VG(GbwqVRSxFhVIB9^F!S^$0WN!)?_B)uoA&zvU8+qcB`FhBzL0B&g4$i
zl^s!6c0_G<(QJAk+OcQw;X9znd88CMqiESZgVF3Y$TB_fu$2A@?cwt)kK7Hu?_3KD
zAO0L-$F9Pqlb+P=_Cj#?&mEl$Ool56u1*eO&dk?O<x7|ISU3i_#}6Rx5e+}rwej}c
zLk)!`{vpP8Z;6?K^JBOjZ3-p+hczhidqEqu#49kFvBaZsLB^DLD!6RM&RZ~9H>FvB
zK2`BOP3b7?Fb&OBw*!TBOVrlwh^F*4?d_BJ>KU#7uhf)wU=sB@R+`d>P<rjyK4kcv
zM)+t{$M&Hb=-AP?AY&Z+Fu3xL{SwNj9sAgy{vD2WH8VQ)6_{oG?CLb9bnHf5k0){L
zsr#tO?rrzccVM+Ls$<VX>9u1AQG)N>4j+x`*pH&S(y^m)LB=>X4z9dot5Ckq5Yn7m
z|5)JI@oV$GDu(M^o@9reHk?YwGN4Tc0HpseN5naMP!w9%8HMx)6;@~swoR@cMyW75
zjIyR$B4P}g*#$0)=FtkE47NZIGaKg_4C!7^j-gGxut|Gz33Pnt9?(Yh<Z2|)lcRAV
z$#{~hH=D8JhiWH0jx#Y99x@r<aU$eXDsyxerln}+L9RoinFGZDnT{e{t1=zC07|~y
z70tBwVO18*9uUw`bbz@;JEpH9$Y^Sr=IMx7zM<z!%67e6Qr7ZZN!hliOUkMrDJk3h
zjgqnrpD!tkexjr-d`DHLeUN&)+qr0_&TQ~^t3#@-%a;khh)A^UC>d1AUhcp}JKDK;
z?v_Us76}(|wlY|>V^e7~v!OVT9^mR6l+tL&0m??R4@!<5N13CZJ39YBx|ksAhbN$~
zyS)nO$P*saDVg@=p!7F5hhHUoDd;4Wd|O3Jj&((SUD1vrf5}6t<e{#4d^UjP$#Q4!
z+u#ie??jy=GF1I%M%zR;R#!HUy<O?M+K$pDl`2CaXnnL}^%c08(uMdOS~m!H<Ov-h
zv`O8nbO<RQ%BTF}D?>xsV8>;~&wCNcF57`CxZa!R%7AOw{YUAEj@6a<<Xf5SavIm6
z(QGig5^AtA+Aakz@Z7rL(p)wtJq^t77v_r2TOjM4EwvE5O4EjUOO6dXe-T?o@yS=A
zWroRe2D0p*5zQ|9=qf47-{J;T`{vloEbt+a(Yf9WkptvF9F-W%FrI05(9HTLN3+w{
z3x0q&{4Ahj^@hBzR_L;BEy)J21b3T*)_OT2dIfyY#c^XcxEKkNRY!0-v>>YiomI#5
zNrE3Bo^5B3i)K5d7iOgwR%W_j0aM}m=NH)0e2YCHEA7{LbvUn*16}B;dQq7TJ_e_t
z1ulRjmyymJ=TRtlVmS(%U49G>SI(vIYIpDeIN8p%q;nKzWP`OLo>~f#Z-_|o!@So!
zCLN+<^@m}Mb6mu)H{zY_zRsrxsPa5R>kgKhnAAgl!HX`sXVAF;IdunLS)sFsq2YWH
zCqYfLZO@=eO~(K>h_teN+RMMklrUcG2UjN|%6SK3=Ki8Iv*%5RT|67SAFAPb7UIOE
zEO%ic9x8)mKnl@ejL?PnA#!Nj^QKBu@|#BTQsiTc|8+_}3D<WAZzzyF0Lkv)97D^(
zk_+LnBec;J{*DuUKrq^FW_4!{R14_X27tk^MSyG6)kBsZxkik-l2|4~VpNa1q?~@#
zjb@I{2OkRelS{N)u$IXeZX64Df)&uwUIDgldC+N*{AkN0*J!KJ;n6l5+%3A7W89Ur
z?1RkHnF<df<69)LLf7NDpt*h2c7m0N`!dw~M{vt6Y0jU2hdPbCnF;owM)KYqfaRH^
z7txs0I<u5q*#iPbI8&%)?K)AWFh<{wGar<Cu+A!F^%~^uIxFuYt?6hK8S6s-_}?%p
zVG!wszhqMUp*XIc9A*I1@l5*+kT8ICOuzmDHn0Q4v&-%menH^P4M@_8|KSAM_}Az+
zUz@mZDE+q>RH)avAD%ukJS0T_PinK)&6r^S<8Ee4gf~9EEM&ZKw4eR94ft@eyMsyK
z4AJcBT11_X!e_eSWrM3g!1y{o8(g7d6ErOoIniI0oqiFB+2DD&u6Q(gHs&be)6c}U
ztS1wBlkFIcbF$ON3gcgvBIif5!IuFuPnSKCIi6?228qqH8>t-Av%&A{SSTBONXO1Z
zarVu#m3t5FbaJIAicL?=$}T$qPH;Vt=V~C=Z&AK%@B>=Qh1p<@j-gy}9Xl(#>}D<b
zhq+dN({DMvhJ_(jnGKd})=RU~mm-!8F2EJ#z92h2B=|dVEqgS(>`XwIa9!Sn9PS+Y
zZ_Nf@yV!d31sz+Iot{H18~in{D<0i(Zg%=lh%b8vSE#rmuj0#8aX~hC3<((Q-;tgE
zRbl+PX1pQKxCe~GYhR2poP=bONssG}yvmC1Uyj>@!DHXPDy*FGXcE!3L0<|B6-)ag
z$_<)d1lUsg#~R6O<W(~ywVkMj;v?A4IULPwI)uHPKB@-nHL%CP;|6vK%tnr66&giU
zBFOl*Nr*y6<Y4X)mU3oOE|=zgXLm$|@|h2B(;dd_{xELT)UhKh#oQckDAG;tohz_l
zUEMVas=K5i4)$M|jSQNdzRaW1z^22)cmOu=mIyK#e_LdbJASZqRb=qCr`j520}yD(
z28^tcBbn0NJJ{@8`-U{=*b}s62E2#ux%M|;9XK$YMYEfZWY1X9Q_}HqP0Q~#nmm^~
z*I_0{0a^=HT7%wx0kG05EC3d5EJHWS;MYa!*zlGvLtEnsU;kz}msR{%_Yj&~mr9Rs
z+w&^!YQBIRu);ZnHrC~QVIq)Bq!%2$Dm{*7<nAOx+nzp^o&)20k=)l`)D}6xYUqt-
z!`LOZ0=fPuh<zaR^iM>r$0P%qI2`$}@Hq+4w5Ir^n$W;>E2ShdFgv|c?{AiT{KI-{
zSI`q!$%}o%&GpaXwiB%2d!rqfeIKZDzVaLNolN97n2)RUtj=fHB)%`iCpyu-%}D$h
zVleNp++cw_Q;JPd>1wOE>#296rHvj3Tc54f0s4bQhfhcqzX0y(b)IG(V&O5nv5n?l
zsH(7anU*r(D=7ADPf2r)3}pPn;sKaw@9=4D<RJ1t_#axGaK6UsM1WnLbjz&1Y(ZE>
z%Oq;nd1U%eTADmqA$A?*(!}}6OBncNx!`=|MYH6_DEdmt6xo#?gog%DW$?jZcet4K
zZd@^v33ueeHN(Z#cA^4fXRqGy*^La~Q0g3%H4DZcmtq%rja9{VqFH89E26!)J-;lR
zHViz?gx(bCMQhp9du$~z=N=RZ+4M;hNrkP<N78K1EQK__*&;xt&dU&x0>4sH%2MM_
z=2hOJwMF`T{TL_Nwb%sr^y#~-M-0D%q&}Flw<|T7qQD{gKPZZf&|*2+%+v81jGxUo
zIH{8`Tv}IB{z%f_Kb{0+($hahbo~AW=y3Je{7gh|>c>2pO}*e4WC1!^FV0NLh<BkX
z-+~d<)uz2MpQUi(G!b1+G8Ip<*I_KdwE1K4&RVeds?-9o_c}}5?AVE+82h7J;0)9r
z%Fj~xp@e2-BR|gD9g?Xzg9ii|vhfdbx@!(vVJ7lo+nyJFsbXCHsdx4-?{qkp?0%kR
zy2p~8*h%kHS0n9xBhqe0T0Xzhe15pu?7SQj(%_uCo`cG^Jp(E|t@DaJwFT5%1}38b
zuu3)(=9@UGDM}ZSj=1W455;(U<*a~Me@W*D@_Ob|yReFP=swDYi(N_tQJrmhEq~|}
zEq|BS@;nIoHj4Umk=Q&@?|b^p^E1@E=^B06@GP{g^kg#>nl^!)kun2S^llw3Mil!s
zkv`Z$dm;|oUdboB+6H{sisD?vBx#ZnCr_Usv*ok7HmT6TOyt@A4-G3^tfOq)X*Tpi
z<!IQ&TD<>Cv<%9=%g9n-p%I2*=NVa(yGwAg5gelxWh2k#>v#s8g7&rtF4k`5{ZmLI
zyQGYRPAA$fGegTh!Ak32qSK|0&(-nebjP6cDHp4B0xShjKm-lhEZFUH*1V7RIL?cx
zEp)p9Q!%-piU5~yfye;Is#{9h4}xZ%8s_QPVbsmOHC2vg-+J3*TyIIO!?h_jzJCK?
zDs_H8EaW;4x}H$uxmfE@xhRu_vc*LiCzK5?$}K{<TvKG89nh1bwr`&-0sG&1>U6L5
zd$H;}6Ft|Jk8~bgInM9@hb#;~HN1ZX*OfYO75e&{vJ+F+`E|5-=KwgPnQq-XonN8l
zA0hc8Zt~M450JdoO@5f<P!-4<+~hBi{BDw;L<~jEHyD|UMtdyVA2d^l%r4lT)aGP<
zEi2U*Fi!P24Uz}O%yh5dpM`R+eV3uB2;pin_#(Y0QFd8gnV!N{m$bi*W+54$L}XlE
z1XCNfX_fPk7=gylAuQF1fs}2(H@f1{lD(J1xp_k7>1f#_(G1pRSh8ihowuHqR?4AQ
zOXL|i4M>q3XE(KvU<gDUY@hdkkQvEjSF-n+x5$W@;YK(i+Of;$d@ipa)Jjr~QcN?>
zY|)E^`AjhSWNOi+dX8j11(#A`24s|WM|yMHm{r>zN2M-Dj*jyZGUD!R<jww4+l*-+
zZ(Q;?%*<Ef<4}$f<{4;pT<0Z5ok%gEa`%bLb7Xj~WSG(=!;FWg=q+qk_Y|1B1_>~?
z+vnW(OBMs}<a$A-Nwkz*#oD83$2o^`Ow39mo|PB*=~>>6_Bo%GeB9ClQQXd?r#QdF
z^q$vS+CNkL122l>6K=6mtzO19E_RTWo~CDYw$k$XVxfCNJ^wX3!&Gj(0ezHi!J;?a
z1y?xY3VXNP!J7=wvwMy^N2LC7Bf+y7kI-Sbt1xZjn}Y7?IkuNM{t-FC`!FW>Pjf;j
zM#SmIQUS?#F?r`Nq~`IM4GzaG#6A-56r$V8+vU*%T4~3oJ_tKb4KjgRw4wL)RAm#r
zod+qnUJFJuKd;I>@45r26mj(7d&!UuR??Cc5hpcHl(o_;Y|XnRnG46qD{ij5B|mP2
z;S^LUj&o!-9XDgYxlw0PoOesUk-pr&Vk~fKM2l&hh0l;ew7R6d3v6hsnaJa9dmdkv
znu6=isf%!(lM3dh>hYx4xe$8vU^!H>w*yoRo8!|j=I%t)+{xNX>fa&u|M}-4p`E#y
zcZ?|1i<;>C01&rex{r)vR{CjFqJ!Saip1oE13;;BM8gAG1F|1Voh3#%{UsQ;9NwWh
zXrz6ux7%1r`wP1Md!6lC%$V^$V@Bk(W*~?6m9&2rYEVi}*}46=U^@nz8@SQ-r55no
zT8yhdwY+~v=TofvYkJv|+>PdHK4GE<o=1{#WD3546P^Ar$0zRQCn%Rq9~aIw$Oub_
zSz6`mKl7>_<O2e`@`C1l!<tLl1Lzc(4o$1M<HTVoi)M~)<FK50uv$jvb`97M22go@
zU^)FhQg=kABk)rt`417+bw}Qk>zi`LWP+4~OaZ(XV+J8zN4U?x+cj+81#=jc<qDkA
zr&4%Q7U4o;A8K@eYaGP=ijUJG`}rg^)4mxZ{S$;qBY3n$8qR#}hX?V8QS8(32nwg~
zz0jd$*!jj!y^j3H0Z@=#<_TQ)VS<VV_Mm4UptGC@$d2A!%o6%k|0SaNgeU<s1$cN3
zvjAG^W#iL$w%WLlZBghLQMFuM+n%?uA9F5Ev@&)#fp=P*^Lr@Pg97&^%bc$;2R;Rs
zE-=a?;E)VDXezRW($#;ZvokM(mCk5SjYT9i1<u44$#_V@lab@NsqBs%r~hFCH_bq%
z4fHM*UA8*?MJ<BaLyMq{$E~qlaO|^e^qYSIiwhe4d*opZMD+Z5L`r#tf=5g#AE%6z
z^2jMnW`}@CCUQtL9HNFp)X@4eEIH&O6~Nh%*LLVs+Hl~J`$U}6Im2Nfwd<2i<aU(w
zcHF;!j;Kug2W7X5m>(t_M2fb44QlpvAD+iYUav!s2K~^mQdpZ;D(xG|2crQUwR-XJ
zQR_-ifG!-0L<Jo5p{d~6pmA#8$6lxU@W`gK6t(3%^bFH5=yBk)H`cayW%nGEb-+Es
z#B$<}tyGteH%E|S<JyM}H2=dG#Fd^RYnWeKWS_5}_h1D~9Q}^{o;7{BVe)%eu(-h3
zo9=Orl7SxdMfRaMud7sL0V|gpt0kKP@?}tXfP(>)9C3Du674bQDd3c~3ZCKH5eyx4
z7GyQblKT5u$N^b$aCozEFmj8M1aPe>mfk!WK9W%_KV0^Nl&Xzpi{{Noq2c4f#a%c=
z;`~~VQ;7DNXy+?*$os^}l8z${!d9~PDTtzPwFwzbRv`P+%G7UjAEn-GdoR>r*y-pP
zKm^anDEe^l8mK(MITpJ#=bwyg3b~%pT<Pi2j-yoJyznFF!D$-A`>Tv-)F)Y=%odaF
zvAI;ZR+of!p(F&Vr2U2=!KBP3?VqIS+F~*F*aQ$d&!_aI#^~yT^yy4r!t}FDdU#}d
zl<9v0Ckq`aNH3xM`<ebTot~a*i~H)+`QpM{F)*F9!t~HFoKIApO%%S*D9>ju>64kB
zWcmk9dOmYW=hW4CC)3}n(}y$PIWlujQ3q%S9*`~vz!cTp&PWy-P#uh-`3=@aFP<iC
zD;0FYP@@~(4R{pFffy4t=d#R$8*zoEsDO?zK(<|IHCRmRhpAh7z|v6^kl|^y3MsXt
zq`UnxurlQS9_p-24^Df?9BB@BoP~@{8m3w~ON04JQ#eG`KtPUx9J`z4cm5^MKAimv
zKQ!5QY(Nu#P%Jg-kAOegVb&V@ILT|`!l4unBhf;%2Gu`a#}P%=q(<*}oKCn|9;TT?
z?0>*vbcFnQ^k}AGZf{lQ!*g+VV_|YyNL6*LZXn3i&h4v0qEnSg%^iqlZkgMI8;Rvr
zWq+y6ytO{_TJ({>1lDJM?7Z;L$f*5ysacDE$=`oqiC&fYw<|J#svMg3>uB3!zUYcy
zrGFdE-ZB>>M8n+Ds%-7t8C8gds<NrM^Q*ESo?C&1`Es6hV~A#h&rJ`h#XsVvPXI&f
z;y>m#qx?D*>6urenYZLTajpw=9wy-(4zvf4Obub+9~??eU;Im)-OsjFY^nx<-F0v%
z{W~7!7hjOwxtP_>U$D?$3XhXHDk~L2sBGOje_nkVPQ+X=FL^=8O;0x_no^;f<}|Lg
z&52~w1*uSD9KV*FEnInd%{M1BuRhe2ZfFSAH-(y;5}|l&Ykc=?o{2H}xcCayjaTxE
z#g^9Qt+A$fV?xDSw=Px-7vlGtt?`A;E%^E7!iAt+jGuZoEJ3`kxq0;#{AROeTLM4j
ztgTOOS63wJ;^~G|D4D29)i*bV7OPYunTk<(NqNnPWNH~!zuHJKQ|N|jsQ=&yp^KHa
z!kgDpV@Rr|rBE#h_&sOSR{S`#2|saNxG+`Un7|K1S1+z0W3ndRl7N2}E=(qxYFDpo
zZVn;q(3;BkhIYqmYvTpi|4McH<o`2o=nlsw+k*D}UoGXoddB}<;{=AdTlr)ADh!4p
z84N=lp3OXhpRT9kEtp&Q1N;zvWuNA#sOOEFn$sc93ALf!&FNN=3UQ_?4~3YN+}50K
zsO8L*P9`w@G;T?>CPQ`2tuA(oC(C6PdQYNtH)gb^x^%L>X=}M^YEFez^Y+lZS`}It
zQuC53G$*w2x+|^=Av&LtvXHi89n6Oj^YF@oWGXa&UUKEU<ovQwJSD|}f-*&WQmysi
zN;QXC8sbf%)Xw^v1g5~n<#_1<G~ckjzJ;1ikOIW(g}*i36snNoC1*>~F4&O>ZH0Nz
z#k6E|V<NSUMvqr>ux2PPpI1AcFF}Ck=9jJ1zJo!0r$M4tmkBv0b&i~c@!p^2=Iu$?
zyFKCZPAv`Il7Pz+p?aC_8)`$Cqwwm2P`qik&QlwFa`{`+a7w%muXBJW$~Ct)KXFMD
zeTV|XiOJ9wWYG#Yfgp3S6)enWbh+lHhTTTkih0UsTrr$obDbEskW+7dWwE*d!$O2@
zFz-iMzNqWtc)J4|6;?l3-PAO<wqg`k>c)6$6KW*Xkl2yHvL_jehmz?ncril=S=Hce
z4fQqg1~{=cw6h-TA~v=ySQj-UT2rW^c}X_8jd(2v8Zms%WXM{rD?{?8i`DbChPXJG
zw{=y>CRtWc)|y;KaOYDjvlYflZ{s%D+R~8Tij`U;YYtW=>QmcLdu(d)WT>?n#-J0y
z9=vNpP_(;^x+$9Ui`a-lHK;#!y*L_bbAxVN$#iWq*vU_4K(STSl4xy2|Hc9>d69@Q
zt){uL5l&h;UX82S*4SJdN?(|i2C7YzcY;Wh3Xf7f3stLH8|MJP*NaHsuHPEcGV7bL
zUWEB}O(-i|l$is7VUn?Ayjts`;LRJ&(CMX&M?+E9R$jUOx*K9^ue)~L`YU4_DmO-z
zHZoaW-&C)f;#=#RlMCIXm1+@Q7P3gEs72{y>moF;c!QxZ(M@&pGLH3YUUnp_)(sy0
z9xdO@z$(7mYd*Yn<nf`QZHQm|ecVp~u6sfspY8g=&=8-y|2Nzcgm4@16W$sCUW(hg
z7Qjye-V3-CTLN8xn{jLJ0Nx2$8c_Hp;Ly-=z+Yq6tQznQK)(O18QX}50l$YG=U%|+
z*hS@wszP|UGaqmao*Zoeyby2~;JX120^W}YYsUd^{Pob#0AM%ZjG$8Y^$iV$0srAS
zlmjq?!xH-eqc|dR1n_3SKEP)Ii^sq&9B8Qkd=m$&HUmy`U>D$3INx^|a5r`pdjVg0
z8Fr1uI~o1}y8uIgVZg(HEr30M`v4iHX`p-`yk7ZsmHGk`#}?C<b3x}>p6D52^&#>U
zfv6^z-sLYs$<-ueBY}KZ;O{Z;@tMe}_!^MR-)HZn@JaM}?V0JZr|YSqp<mL1lgL|p
zlDL;#3AR)5(VlkjZ8;6!r;y$WzFSVi_dTTl0eqi74d07MZ@~7z+|&4LBGR{^?JhWt
zzNO&16?}E4(Z_c_9YWjZX40wrvKM?i(KlHCr{eo6__l)&UGtQDJgf8&_^tvxmA<>t
z2dn0V)lH|-_bu>!349ZZPOa}*@EtA-tKXbPA6xXN7lidY@=npNE&|_o!FT>?^lb#+
zbKtx7H0Av;_!eDc&ODtW-!FpiU%}UMntXo%z8e>Y)ibBzdlh^O%EM~PY3!Q?|E^jT
zR_W8|y8?WN!8iXj`WnF3TY+)nH2OXTzJBoCaT>nwfv;h4SdB+LpQ>HG2)<nxht;%G
z*mn_BOvG4w_tLPMF&bYH2h6sjyWu;Ax%j&b{9jxaR+pS6|61_<;?l5M1b8Yt??(E#
z)nT>!H2S^;zB}J_lJXQ4Ba^lO$I&YA_2D!<)!D#u(w<(>Gb9#q-TZO?U1N&atS5)t
z#(pf&QAATDP|v4;EXPkUW*8a)>0bps3_72=cmuX8C0M!_w{*Ii!3$Sua-P1);1dn(
zog9`JPuw$nu`(<WRV^Xx4-0(lt)XT{?hR<%mTP{o#yJ%+beVK|gW-rVh+Fs!w(Qe2
zn!lRnpu#s+3(fkP>jMV*iNQ>_@*YqjOb83G^n>Fy&e~(BmMhwWfi{0Uy_WKX4L|%U
zxXpLK;C<u5M)E%g9NJtxYDV@wu-?QmC1D|*Y2f(=USi-n1K(p{oq;<Hyvx8(8~9}d
zzir?X2L9B*-x&Bu1ILt_{0%(cz)K8VXW)AbtTS+jfp;1BX#>A(;I|EY!oZ&z_!|TN
zXyBMBCVvCZH}Dbz*BSU81M3XjVc=Z`iW6Oz4cH=Qh(^N#)s<`4t_;n`>uJkEOYs)G
zrJ?zowqUnAt+9oR(}FE7!z*n6%A6O!ZJqz`asKb{=iAr$_Wenn1)&O<UuALCBhmLv
zJ3Gs8*>Ts7OWtv}Kp7CuH-2?CMpLbi_Y(|3JJ1O>e7Ou!zv3GsG(*1`=k2)twaTzC
zTYOkj$7TcQv5;lp&=^~P9o`v<7hcA24__->ON5C={TjS{MQG#hSRLOX`5@x*PzO(3
z>gv>aNS5a|6#J-1F;?v3bmaRAF1zt(ePkg>%I_<_oWMW!41%JuG}vD(!@b`(CM;>e
zc>sZ;AYSZ=v><(7R6G{RS0WZ%gp2R&c3#H?j+k<fxe>Vf8~pjz)wmY>E+7G6(Ux?5
zL#@8nF51d>WiDJ&eyJubOrdm(;*GVJEX9kgx6~}ENv0Row5ICIZ+JU`!`dLncU^}n
zZwM_ZU%VW9e!koJ8acmuA8aW0F>URsMjEtDU%_LmMcc6Lx2P7oCe5jBi>`>gXHl}%
zZYJ1m2D3k4HXZm*?nSb_Cby?7{59u<2~-#U;AK9L3Z<Kp^;@|aC+_tX=W%%#DryFM
zQmxojEnq7eTZsF{7$rt1sD(sjzTzZ1k^;qJi;8(0j5-v7qGH}`p>BmG&u2{>#m=H4
zyd^fy_E3cPt8T%&VvCCTvf-f5wo%^<pY27w>$ZVScMP5&)+pbMnKa=On~ClK8WVKG
z*m|@lvF8&Fs47=G_s#Z^Zq@N7oq-LKU0_W8V&$8yC2tuMCt_5Nsb7*$sTva}qEo`m
z?7ZR3q!;;?OEy-$t+acQ&6CVVTYssRf;zGOQmc??jMc7uD>SWotkAYMHScW76E`#G
zl_qC0)EFT{+cqv1!|Qiz@P6H&BUALPtJZ{J0m67z9f=dhBT}R$(kj#0{Gb&3xHYl?
zwEs|NYx-++Hs2KAyvb811SZd%JjHj0uM`Vd|6Da;!sQ@gFfmaKo<%x}ma|j^Ca;{Z
zYQp-d@0#ex0(Z>$YW-9c!Z$^gj@dLOP&~7EUhz~8P*h$F<)C<#L!(g+)g{P~DuU&{
zcTEfwQ~3oGDG?sy19?mkJwfNl{Kmon7h3EVT0eDIY#jO4PhBcTj`#W2Po=U6vtjL`
z3AjBwso8U2x?f(4@AJJed6M!Wur&OSJ<Ajxjx!v<pI=>v>j<`gcYWf`>3Z~JMrxej
zj{Sl0zN^!#7gb!1_5vfu`R#-mnBlwHAJjBEX$I!{{6!%BKn!CkMi{0F#!BV|owoZ2
z&houle6|15srP^4{)*z8+wT9~cm3s4{R^fR&%VcBhHGHg{=kG+?qBlKYX^V!wU-#u
z#j|y!_$GhNG!iw1=+vi1V>%@@ukIzS;3mHxW#ES4U)9m<ImXd;L2ypq!*)p!D1nE?
z>&Tw>UA*T6zN^&iA%Z0L?S$5avbPD`yZyrZdj>ls%HAgMlkwRxP4+fN;Tt*9k23oV
z&n=!sOMXt0NhLpxoOZIs^6qW4?84dI)nVuWaXX-2?UY|+l4ftRK`XU!>qx)aF=9W!
zrhS;g2-Iccw`me-r8fRClj&%>Y}&{3JUfeR{GMT2sg2u(=4iT*wRc~__Ty)!gvBu1
zeV;SyP}_A6ne~{lJ`cS5Y;zqj^0u*l^Ca@BJh{6u72g7wYSnO?jbVk6Xl+sDc#4)N
zuUxZ!VJf~=m2YiImv4(Fx2f{l-AxeIFx9G4cHmht9z_)(F{HI78sZc%v6hCE;^Q4$
z<rVVfb$r%S-r8InPsLSvVjGsnc*GprRts5+sq&gsb88YAYH(`}5}`BRSYLw-o1qMs
za?!2zY)OKf&%$u(3ap7O>8-Ii9*=HKP>Y}~=`Hdw+v4?2b<H*&-?F7OvBP3~#%|+c
zokid;8^v=d8#USFYwCY3G85u#ZCoHo@P`f5K=#gcRIa9F<|!QPc{5<;XZgdxhQEgs
z5^VTlyP2gdLqu*V3?b|fODt>@ZZ;W`he6*>4R_tep#2ehMK*uCKXz|G*z@D0S6-)L
zUl<Y0$$9&`0%1w&GV=1qXHdAmMpJD5b{}gkXk@kd+x@uthSBc7fklGXf4uiWU(4HX
z_q+Pcjp_T1oVDNPW8r3`b1%)};qhUS2xGm%P%T$&KY6VEhOD+C!aA|?2aWtekG##_
z%G>gPz$33Fgh4@|QxWX`A>}9H&nwR%l|Hfimv)@$#UhZw=A*IUdbjuvMBMUrd>SzF
z2W`QOfNg(vY`?=JZ@-7Ne~K2ER$&AUuyU6AQAFJN+i~@am72qtVcGLjjwN&$d26P<
zKR#mQe`@?_`K|vf&b1)(xAMc^k<uJ|#_SHZ{Fe3wMBMUy*M=pj?^?~V(N>H`^Yv#?
z^)*B&&pyClzq4h(zvcCp*Zyxo#w{PU`+nS+KscTJcfsS9=j*B&HXC_weqOu_yey)%
z-|q8P8~H9ON3d?N^46{=k><`nWcJTPH;R}FX^_8Kc?<sqDQ<bY{~k8-)h2(dz{*+p
zGmrei&DFwskOKokNUp;dD`zRcLWDG1{w^cmW#q$_(Lk^K^Pqc76izG8+irL8^7bRq
zOC$dP591?r$#wW*{cb6*BQl!&;hQyw0hWCPFK>`Xlb>*l7P-sQVZ6L&o<#l=)mmPj
z)#Y;^nb+Kt$bTuWg-TB2zlxK{AF0vu`(1f6>aD-kM!v$s7p>KVZ+PfnmtbM^B>Df@
z$iH|Jc}u?GB=UU;&Ed7*TmKxUZQHdv30vwk7Pp3)L=P%;?{Tqk-ph#%A!IT<AMuU&
zv;MR55~u0W@;`D15)fYC;>Z=e`MZ)vL<6+WA0CD7&wpRgofv>6VSm_7l6U~Kj$IeI
z69ZUzbp=M_AEWF#rjUQEvg?yVI=&J)el$Jf)WK2dSX|h3f=f{Viv~OYyT~ZjL}lmo
zLi(iq_bUtOlk?9}3+W}w&aZ{^(){-q3+YpooevA?XXNL(Li$u?=dVKgG|WfUZj!_U
z_zIw%Z`_Fid?nD%BZc&{^3P`r=`)la_Y3L6-}fq{pW{aJ@qn6{kGms*g0DRervzlH
zY8bb%fO@Bm7Qldf#j$`SNI-=~5<v;5*(af&cM|%X5p?t*wEman*T?Qe_T$m$*r>x=
zYEu4Lh?Sw{(fG?j_u&g}cHLw7FBAI6_HdQZN45t}_sqA?+^<_bjlzGnI&S7=mWScP
z`14_PeAv*1h)Wy(s3&wr*pdXE%>IufmG*}{?enujpQ`M0SgY*sg+4`9YzkYFz=woB
zvRsdWPJ3D^!@_4TC-eW$!7!Sie*-#ximR?#6GlwmGZMarztQ;L0NsbLkM<b<*l9cf
z2a^6{51nV!NbmK~_56Oede%dqZTR~<^fE(#(L-Ni=#HVY{0ysvK0_Vx(0Rs;_6&IR
zTxaO7dgwP9`k;rt6?FRl!gq!xKRHW?*ar-KXpW{cKZXw)x)TZuzCf;ccmVone*Vl!
z=wCbu{jkx`b4(0&eZ)5-(@vfnVvw^#fd6FZJfFlMXOsYcZs<IZ#2{yq0ADn8o-1Oo
z`u`1dpMT`|S%k^o=bxdx=RT%zQQ$vAE%o#ZS<j9_UnY7+j^~$y9zs9$j?e2sKLh3U
z?#pfzx|lAP2TYV-rXv5ra9AinCG0YEo=0Qg_{EShbe{8L;QEE(Glp*Ob2U||&lx(;
zjWNuCzZkwQbRFmQJ`;V+L%-Yb|HA0u`9}sh0}1#N=phn3fv?;Md1yq71G>CCx5to{
zE6OKyg8<lk=XvNQ#-2-sK5{*<+QUD_@L%ttKV!1m>Y?`-{ttQRX4^!4%tL?F@PAF{
zljOW4RUa|>k9zn^4E;xjf6lpKp?u!Ze`V;88#?bJ7@qg&*`mqnP1607RCQ%oD0Uqk
zz`)2S`!?KX^qdL$d86>p^zhqptU~CM<QyY)$yr9gN<&YW@yFV8tw)djZZ1EHJq6>u
zU8ez+ko53BVCWz9(BClh`$&iVVN+haUjMxCPg32+o?8t6KYH~1!ua744?So2e`56T
zoGOEDC%*x`bd>)72ag`^`!N(_W6bUUOEp=|7WyRBJSQxaS%$s<^eLDZ?0vfR|7wq(
z0mHw+=<z-$+HB|>&e8hiEIMR(rqXTCbfagt;pgYc7&3AN^zhs71pl3f{u#sn4G-P+
zm+u?>XUq-@r<?&t>?uQk&WvN%ntJ(_M-SHl3@>}=yk}zwj$ysLJY@Z*sqiJ}?(*7x
zvCu=`Zv@r~eUhB(CFu@BztO`#+t9Zg{;a9Tl%ezanmgYIOu7EX@bg?agPaWqyw}iq
zzMEm5TyYNG(0LA;LC!)0ehYM#SKU-iaz1=V`17b5H2MCshyG>5^1O$BiJ|}5Ltks?
zlX1Vxd5Y(#8RRTAU`XgflFJ+uT>(1p;cc+(`5F(uZ9iL#ex4&|Xpt+{Gai2Xz2tTe
z{mbZw4EKRPT6_4s(ZB1wFxk|f<cc%GhR$>N48M^p&Wn5W+d6$5^wG-IYxH=Zv;Iox
zqul?R$Cw0smW3k#_(f8K>-)-lfS*jI@$Q5gd@XqG#_O(+Rjt2aBaVf{VpkMkSFLp=
z)i%erHsI&;4KaD@6^o~LDLm0?X}~v&Ys)WLy!>L-La<orCuX(j#>U+?gUGd44C}YZ
zy6Y>iiNq|%%xru(FL}@=c@>-ouqRo{7cX0U@d}0CNun@K%`yHmQ}K6^F_c+ti|<Hi
zk_gM&4pc%;#o(LN_%US~zt2<n`g3!vF}XD#iPhEb!ht!`^(h4Yj8fs(bFt>8nnd}M
z6^oas7_yAf$0}CSkcc<oL((z*1MWnv$v}RGC@(31ZRu2fLo&7{o=gB~iMJ*bl+MTb
zvoSnNRJHm|2e1I=pZKG<n4u&UUK&7Ue5NU-5ti7MRoAVltcqQ?Zru%$jj@fDYpNow
z$J%6bY#V-e2Q4u%6HgoQ#)cSvZCFT<-yy2l6*pa5dCmH@icc%`ho;@90rkhG!(sO~
zrOijFaV!qT^5=0a`0O^{*ic^=<1Y*qejON-M~^yFoe{Y3jqBk;;fZAvN?xcs|IP10
za(&X2AKrI0XSS<RJ~_^8_#y0cQoa#hsES|8E~Mx}nD2!bCW(!WErmq=Thc<Be4)IM
zG~(0Uo@6?SA5X^th=$tyhs+C^*rrXBs;$R^Z};cE3pwTc=lGa7%APDtp(pIu#S2qV
zBhpZ7QZf9X5<kwC>}*%E9~v)|8F5Gh8P*iC$k)*eN#+CPqCek7dHA%D4erKA*9&RV
z0Nsv43m<N&=9A}zA_X5^A5OYh_j2|FIU75ivIHMWmyf>}lI-C_wA-c_Dhlr*v7dP_
zWOQ{185i`I;R|_CHhe+eLz8d4duSNJ%qXF|5CrjKWU0ZX9Uk6PD?VdiNQ=dA;K1}_
zX%y&}HQTnwIOYv=E>-d5Xk8mkVkdt6%$|%B7p6DMr|5@e=`Hpm+sEW{_Jzr|Wyuie
z8V>YGpa%;n9Y#)6M_o-rb8=)`XsT)1U8onwL~FKl^eZIer^hYv8V`{+$eUPdVW_we
zCm=_cM{~fhg9~*+re?GXb2r7ho%oryCtHl%{Hb}NvRFdSg2;5EeSmodt*{l8LQa^1
OAL$p;<Q%D<asDS{NQ^Q7

literal 0
HcmV?d00001

diff --git a/lib/tests/test_opts2.c b/lib/tests/test_opts2.c
new file mode 100644
index 0000000..2646b2f
--- /dev/null
+++ b/lib/tests/test_opts2.c
@@ -0,0 +1,151 @@
+/*****************************************************************************
+* 
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation, either version 3 of the License, or
+* (at your option) any later version.
+* 
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+* 
+* You should have received a copy of the GNU General Public License
+* along with this program.  If not, see <http://www.gnu.org/licenses/>.
+* 
+*****************************************************************************/
+
+#include "common.h"
+#include "utils_base.h"
+#include "extra_opts.h"
+
+#include "tap.h"
+
+void my_free(int *argc, char **argv) {
+	int i;
+	printf ("    Arg(%i): ", *argc);
+	for (i=1; i<*argc; i++) printf ("'%s' ", argv[i]);
+	printf ("\n");
+	free(argv);
+	*argc=0;
+}
+
+int array_diff(int i1, char **a1, int i2, char **a2) {
+	int i;
+
+	if (i1 != i2) {
+		printf("    Argument count doesn't match!\n");
+		return 0;
+	}
+	for (i=0; i<=i1; i++) {
+		if (a1[i]==NULL && a2[i]==NULL) continue;
+		if (a1[i]==NULL || a2[i]==NULL) {
+			printf("    Argument # %i null in one array!\n", i);
+			return 0;
+		}
+		if (strcmp(a1[i], a2[i])) {
+			printf("    Argument # %i doesn't match!\n", i);
+			return 0;
+		}
+	}
+	return 1;
+}
+
+int
+main (int argc, char **argv)
+{
+	char **argv_test=NULL, **argv_known=NULL;
+	int i, argc_test;
+
+	plan_tests(5);
+
+	argv_test=(char **)malloc(6*sizeof(char **));
+	argv_test[0] = "prog_name";
+	argv_test[1] = "arg1";
+	argv_test[2] = "--extra-opts";
+	argv_test[3] = "--arg3";
+	argv_test[4] = "val2";
+	argv_test[5] = NULL;
+	argc_test=5;
+	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
+	argv_known[0] = "prog_name";
+	argv_known[1] = "--foo=bar";
+	argv_known[2] = "arg1";
+	argv_known[3] = "--arg3";
+	argv_known[4] = "val2";
+	argv_known[5] = NULL;
+	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
+	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 1");
+
+	argv_test=(char **)malloc(3*sizeof(char **));
+	argv_test[0] = "prog_name";
+	argv_test[1] = "--extra-opts";
+	argv_test[2] = NULL;
+	argc_test=2;
+	argv_known=(char **)realloc(argv_known, 3*sizeof(char **));
+	argv_known[0] = "prog_name";
+	argv_known[1] = "--foo=bar";
+	argv_known[2] = NULL;
+	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
+	ok(array_diff(argc_test, argv_test, 2, argv_known), "Default section 2");
+	my_free(&argc_test,argv_test);
+
+	argv_test=(char **)malloc(6*sizeof(char **));
+	argv_test[0] = "prog_name";
+	argv_test[1] = "arg1";
+	argv_test[2] = "--extra-opts=section1";
+	argv_test[3] = "--arg3";
+	argv_test[4] = "val2";
+	argv_test[5] = NULL;
+	argc_test=5;
+	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
+	argv_known[0] = "prog_name";
+	argv_known[1] = "--foobar=baz";
+	argv_known[2] = "arg1";
+	argv_known[3] = "--arg3";
+	argv_known[4] = "val2";
+	argv_known[5] = NULL;
+	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
+	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 3");
+	my_free(&argc_test,argv_test);
+
+	argv_test=(char **)malloc(6*sizeof(char **));
+	argv_test[0] = "prog_name";
+	argv_test[1] = "arg1";
+	argv_test[2] = "--extra-opts";
+	argv_test[3] = "-arg3";
+	argv_test[4] = "val2";
+	argv_test[5] = NULL;
+	argc_test=5;
+	argv_known=(char **)realloc(argv_known, 6*sizeof(char **));
+	argv_known[0] = "prog_name";
+	argv_known[1] = "--foo=bar";
+	argv_known[2] = "arg1";
+	argv_known[3] = "-arg3";
+	argv_known[4] = "val2";
+	argv_known[5] = NULL;
+	argv_test=np_extra_opts(&argc_test, argv_test, "check_disk");
+	ok(array_diff(argc_test, argv_test, 5, argv_known), "Default section 4");
+	my_free(&argc_test,argv_test);
+
+	argv_test=(char **)malloc(4*sizeof(char **));
+	argv_test[0] = "check_tcp";
+	argv_test[1] = "--extra-opts";
+	argv_test[2] = "--extra-opts=tcp_long_lines";
+	argv_test[3] = NULL;
+	argc_test=3;
+	argv_known=(char **)realloc(argv_known, 7*sizeof(char **));
+	argv_known[0] = "check_tcp";
+	argv_known[1] = "--timeout=10";
+	argv_known[2] = "--escape";
+	argv_known[3] = "--send=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
+	argv_known[4] = "--expect=Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda Foo bar BAZ yadda yadda yadda";
+	argv_known[5] = "--jail";
+	argv_known[6] = NULL;
+	argv_test=np_extra_opts(&argc_test, argv_test, "check_tcp");
+	ok(array_diff(argc_test, argv_test, 6, argv_known), "Long lines test");
+	my_free(&argc_test,argv_test);
+
+	return exit_status();
+}
+
diff --git a/lib/tests/test_opts2.t b/lib/tests/test_opts2.t
new file mode 100755
index 0000000..f7444f6
--- /dev/null
+++ b/lib/tests/test_opts2.t
@@ -0,0 +1,7 @@
+#!/usr/bin/perl
+use Test::More;
+if (! -e "./test_opts2") {
+	plan skip_all => "./test_opts2 not compiled - please install tap library and/or enable parse-ini to test";
+}
+$ENV{"NAGIOS_CONFIG_PATH"} = ".";
+exec "./test_opts2";
-- 
2.30.2