From c15195637056690c641ab14feb60094b2f3b4c49 Mon Sep 17 00:00:00 2001
From: Alan C Francis <acf@alancfrancis.com>
Date: Thu, 4 Jan 2024 21:04:59 +0000
Subject: [PATCH] read via a BPTR

---
 configfile.c                 |  35 ++++++++++++++++++++++++-----------
 configfile.h                 |   6 +++++-
 main.c                       |   2 +-
 testapp/configfile.h         |   3 ++-
 testapp/containerkit.library | Bin 0 -> 4272 bytes
 testapp/main.c               |   5 +++--
 testapp/testconfig.cfg       |  23 ++++++++++++++++++++++-
 7 files changed, 57 insertions(+), 17 deletions(-)
 create mode 100644 testapp/containerkit.library

diff --git a/configfile.c b/configfile.c
index 2edd781..269eb97 100644
--- a/configfile.c
+++ b/configfile.c
@@ -46,26 +46,39 @@ VOID ConfigFileFree(CONFIGFILEPTR abstractConfigFile)
 	}
 }
 
-CONFIGFILEPTR ConfigFileRead(CONST_STRPTR filename)
+CONFIGFILEPTR ConfigFileReadName(CONST_STRPTR filename)
 {
 	struct ConfigFile* result = NULL;
 	BPTR configFile = Open(filename, MODE_OLDFILE);
 	if( configFile != ZERO )
 	{
+		result = ConfigFileRead(configFile);
+		Close(configFile);
+	}
 	
-		LINEPTR line = NULL;
-		result = AllocVec(sizeof(struct ConfigFile), MEMF_CLEAR);
-		result->sectionStore = SectionStoreNew();
-		result->filename = AllocVec(strlen(filename)+1, MEMF_CLEAR);
-		CopyMem(filename, result->filename, strlen(filename));
-		while( (line = configFileReadLine(configFile)) != NULL )
+	return result;
+}
+
+CONFIGFILEPTR ConfigFileRead(BPTR configFile)
+{	
+	struct ConfigFile* result = NULL;
+	LINEPTR line = NULL;
+	if( configFile != 0 )
+	{
+		UBYTE buffer[256];
+		if(NameFromFH(configFile, buffer, 256))// if we opened with a filename this is a waste, if not its necessary
 		{
-			SectionStoreAddLineToCurrentSection(result->sectionStore, line);
-			//LineDump(line);
+			result = AllocVec(sizeof(struct ConfigFile), MEMF_CLEAR);
+			result->sectionStore = SectionStoreNew();
+			result->filename = AllocVec(strlen(buffer)+1, MEMF_CLEAR);
+			CopyMem(buffer, result->filename, strlen(buffer));
+			while( (line = configFileReadLine(configFile)) != NULL )
+			{
+				SectionStoreAddLineToCurrentSection(result->sectionStore, line);
+				//LineDump(line);
+			}
 		}
-		Close(configFile);
 	}
-	
 	return result;
 }
 
diff --git a/configfile.h b/configfile.h
index 265bc4a..29c39e9 100644
--- a/configfile.h
+++ b/configfile.h
@@ -5,7 +5,11 @@
 #include <proto/containerkit.h>
 typedef APTR CONFIGFILEPTR;
 
-CONFIGFILEPTR ConfigFileRead(CONST_STRPTR filename);
+// added the BPTR version so we can use WorkspaceOpenFile.  
+// We still need a file name to be able to save though I should probably
+// get that from the file
+CONFIGFILEPTR ConfigFileRead(BPTR configFile);
+CONFIGFILEPTR ConfigFileReadName(CONST_STRPTR filename);
 VOID ConfigFileFree(CONFIGFILEPTR configFile);
 
 Array ConfigFileGetAll(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR compoundKey);
diff --git a/main.c b/main.c
index e49ac19..00f5144 100644
--- a/main.c
+++ b/main.c
@@ -22,7 +22,7 @@ WORD DoTheWork(STRPTR filename)
 	WORD result = RETURN_OK;
 	if (ContainerkitBase)
 	{
-		CONFIGFILEPTR config = ConfigFileRead(filename);
+		CONFIGFILEPTR config = ConfigFileReadName(filename);
 		if( config != NULL )
 		{
  			StringArray values = NULL;
diff --git a/testapp/configfile.h b/testapp/configfile.h
index 265bc4a..e988f47 100644
--- a/testapp/configfile.h
+++ b/testapp/configfile.h
@@ -5,7 +5,8 @@
 #include <proto/containerkit.h>
 typedef APTR CONFIGFILEPTR;
 
-CONFIGFILEPTR ConfigFileRead(CONST_STRPTR filename);
+CONFIGFILEPTR ConfigFileRead(BPTR configFile, CONST_STRPTR saveName);
+CONFIGFILEPTR ConfigFileReadName(CONST_STRPTR filename);
 VOID ConfigFileFree(CONFIGFILEPTR configFile);
 
 Array ConfigFileGetAll(CONFIGFILEPTR abstractConfigFile, CONST_STRPTR compoundKey);
diff --git a/testapp/containerkit.library b/testapp/containerkit.library
new file mode 100644
index 0000000000000000000000000000000000000000..1bcac3fc1ad68c299dc3610fda833e5a3dfd1fa0
GIT binary patch
literal 4272
zcmb7I4QvzF9si$wa}LK;*UZXH6_LmFa6QM^BxMoWBK2&d=ISJFh_g18s?Jcb!x|DV
zODZZMbdDenFeLNUkBL=nRiUaC5URD(DpmzlRdjSy_}IoY1WmyW&}B%hs@5op_j`Aj
z1p1+EC;fbP@4f%`$9rcY=fB9h9QIuxa(;^Ea@=q5=WHo4KqRQZC%}tDjuwm`2BwL`
zzW}$1z843!178qH6~G8^2>>tmFz{>O1aKPoC)ig4VW1t@0Q?GgmuPXKglnLGQ}?F+
z=fd5a*7vRJdyY2r{&N2L>E53Hb(?xN_C2$ye}0g@ZIso9YgwT7!EkMDxNc=#?GG2b
zNuOYTMG9&M|KRDN2gtk8SCb&6CQ9L-Y$bszqmxvZI68AqZDsB>Q(CjMas|ozNBgL5
z1y%IZD!Pzkj?iXO5=Tp6=5D#NK}-zj6GCM$;cs0tNv!VP$447UH^S8Zgmi?QbPwkl
zdIDTOjyGjOYo<y{HiEZ{H5&QxrgCocBf(JXIubsJYiY*|XIOb!Ol~G-axi7ie8|dM
zu5=k(<}z0>v5n%GPlv)QD6F)GHko>f-=#O#IpvZjxmK*K<w|P1sk_PN4jCV3g%QqG
zQ8tr5addWl><Ibs9JK5<-%UN~<F9LHY9mW4xP*+vZ7Fqz$&>}1vy>Q!EN-46pGWK5
zGjeeK6k8mfB6nf<ni2dN&olE9@hbryzzZ;7C7=V{!0W)jk&FGvMT|Q!F8+h4jOUS$
zNXEPm^UE>68uJ~P-v+whzm5ol%m5kgPJl~t0gz_JaGRhv#hUacR#r6P??|bP%v#Tm
zvMx$lw$H@co3iEaYa1{22``+{qp_$SWkS)Y*)65oquJ`WwT(CLiq9SVqEjWtR!TH!
zD5MhS2Y(!$(JhHeSus~*_)=-N>9xKrrBqwiiEZTzTGbq(VaRIARzr*HS;30p6OTfF
zN0=fBl2{LQg?hl<4ekw0iyLVX+=5w>%Nz!*b+%qdkybjQrRhPVDi<qc$$WEGos7Lf
zB9mIKXh!FwiGj7?>ZteY!9+z3Nsb(+jcDY%`iep_My?H;{2nSA(W%+Sw?`y;n&=P{
z*3s;J4Ww%^P1lMB_u!hTS(ST{)k>!2Tr(A#WqLRtODm;@#PL^|z>-Sb_IBY;DH(N+
z*UZK9qmf6*%Q-5^P%oY;ZHjvTF4U~6XlXWW>K!dP2aO*@N#fq>*4khhyd{UpuOmOJ
zpoQy!CKCCqge>L0B-3hEo{4>j29KE<$d(3bFUhQ8P6M`?x|C)!zB~f;kV)K|`h+5@
zka@SoAz}RRxk1xs`|L=$|NIuBkUaY#kA&1{#o_+?kPs$SXF(Fjh9WvuA=V6@eiHgW
z+<Frfm19GpQHAymd6zl{d8~@BD(&o%vnQLcmr4p1Up;@a=|-tk$QOo+h+xW9c`&&r
zxtj^e93<a1z4L+Po%<bJT70Otkp)P6-`LQgx-R5@Yix8agQrsAiojexTz#!|j6J33
z=TEV+tFN3L{mt|0(gXRcuX!~2Z_JS#1m`c2Pah-(62D*)uW?rkaMQkbp>AjK+;#jT
zt8eO~=n)Q;CXB-17@*L2Zl6)i?SqddjImtN7{l1D+&SZ%JyysyqM~>ue!6qqxMdhQ
zg(g9x3KN3|a>c<5#sw1x48<{?<5We98eGqD&IS|IYAf!`#h@N;==$B^uj0P+baHs_
zA5|$RUE7mtV6AIzk(_l_TwHs)G~Ky}MMy^WJf@T#&oO~#`e(!AxzBThMp!83U(Q_y
z#Qc)C4jfAEi0?>`#*UG!II_-DM#{@Mv3ti2#XwE|$XCj}gb3u)*KMAT<N0^;tc>$K
zj{Brh$iwoyLN}l*^v^S45}r_L5_S~_59BWZuruE{$Q+*x-yA-UJE-6%PO;!S%b$E~
zV&0$D7~YLW+YW9|%N6!I&so_wvLr3WDgEU_bWl6>ymo>KGso3FL62f*`LS8gTe41M
zOCRI;?`I7Lk<h1M_R?~VJiMz$r)FlCXVGx0&@;$<V#}M*wH7EGedvoOh1_O<&dcJw
zCsHS?$hhNgl9&;hJ0&CU-AuEqE|w+K8LAhxTgi1p?cT?}f9DFjCRM%*qDNydLT>vw
z1+ysbS{*|Tn)V60rZm6|QU%_v{YIt|oyt?pF^vhf^o9pC5<%euUz`Vc-=zAWj!sa8
ze(6QE%1l#wNlxrlR*)x|8$}-bH<S3+Q8k%bignCf^K%lh%8QOBC!R;;NdCCmj+4k`
zzUy}rug#aI$z%2>EtpVsQ2EvsxD539LPk>B+IF%<sr9TKeZo7Z9p>dsOZ%JTV_K}x
zC%pY8N$G&n9AAPQ-?{$`Thwl__PN!(o5Aa%qE-AoJ)Lr?+VW;}7v5!eMQ<Wfl1DSW
zO_!m|e81F!Iyw@s35TMY+B7DQkWXE!?8ABD2qZGrY**D8CPCs)71+yd<+~N{lo*M#
z6_)*TV{_dz{suU>@hhiAbiJv>fI^6$l)>JHNb)^r7nl0j$wooX=_i?x7%*wDy7Ux!
ziYp{2WR6s3#SzZu9+PSWc_bp1Lm~74i)XsZUg0%Y)WM#$Ov<>pJnIyrXt0TE<S{jJ
zu|<%d2E9FQYlYF7FTSqT+?upSbqczbg@yUi1?@P`3R}B;m}@sDbwNKaVc$3Pv$Eu&
z`tTw%OSZ0QZe2+$LqU>}F@cDvltpjRDpf+vgU^avklC~E2C9?T32{;&p^e8mBC3*7
zX0GslV?{U^B#$5QgCBS{k>E{X?^lz|{kR>0YMiQVNp-d)!Q!J<2Z*^dT@3V0vU6gT
zN!1!fY>Ed}$y%#apW<CIf*HY2N|_p@d3{eC@u5uRg06nooSvr*CT56+)%FyXdOCL}
zcVy{3V?C8psqFuy<7#jhEl(`?>A%R8A@$I_%!0YEPFuBtxOC_fh>H|VU`N<uTf6nH
zNSp{%dybhA+XBB%+iM!^HC8OJCTU>ya%3y-vD6Xir3UIW-yHNL-ZV-<!UpUqs}buC
z-a)4x_M<YF_2MM$3k66H2FMfX!YQ~L9U_3fz%!cYv;808bQMB8$IuJ9ZTbCo#qflJ
z82WoD5RXt6G>7a}TkN>a>9>j{S<ONx^7Atv2}{k0_M-=Y18d`_LEb_8s3JoB@HY7c
zEAz~Fg4by)2m0AF=(9M}BkuP_KcCA{zl&$-!rJ(D#Qr^Xx7v*8$2yNuw|b01^EtpR
zdvWh+R04k*`X6m<{}xL+po5(qcT|$8ubG*5Xn2=)Ri<vczM<K(tUTr6KH<^&s^09f
zJaanuxygxd99jn8a^YLYl>(jwI)M(L4HNjzA)KiQ^C)B@%oFAb^Tg+I_A<Yt8gbVE
z>}<3eSOvhZ6aoT(3NWAw@Bv;x20Q>ZZ}ZCuHz&URojA+!{|o5S!Z`gYK8-g{5j2EF
mxKRN(%pdq=+9F!dq~N|3;Jo>m6A%DDfd2^y|0nRvdHX-==EkT1

literal 0
HcmV?d00001

diff --git a/testapp/main.c b/testapp/main.c
index b9b8f49..6dcf0d8 100644
--- a/testapp/main.c
+++ b/testapp/main.c
@@ -12,7 +12,7 @@
 WORD DoTheWork(STRPTR filename);
 VOID ProcessFile(BPTR configFile);
 
-char *vers="\0$VER: ConfigReader (dd.mm.yyyy)";
+char *vers="\0$VER: testapp (dd.mm.yyyy)";
 char *stacksize = "$STACK:8192"; // only works when started from CLI
 
 struct Library *ContainerkitBase;
@@ -22,7 +22,8 @@ WORD DoTheWork(STRPTR filename)
 	WORD result = RETURN_OK;
 	if (ContainerkitBase)
 	{
-		CONFIGFILEPTR config = ConfigFileRead(filename);
+		BPTR file = Open(filename, MODE_READWRITE);
+		CONFIGFILEPTR config = ConfigFileRead(file);
 		if( config != NULL )
 		{
  			Array values = NULL;
diff --git a/testapp/testconfig.cfg b/testapp/testconfig.cfg
index 367d98b..b73753d 100644
--- a/testapp/testconfig.cfg
+++ b/testapp/testconfig.cfg
@@ -1,4 +1,6 @@
 #this is a comment
+	foo1 = alan
+	foo1 = alan
 [core]
 	repositoryformatversion = 0
 	precomposeunicode = true
@@ -8,13 +10,32 @@
 	fetch = +refs/heads/*:refs/remotes/origin/*
 
 [branch "main"]
-	remote = origin
+	remote = testing
 	merge = refs/heads/main
 	alan = yes
 	alan = no
 	alan = sure
+	second = testing
 
 [branch "config-file-parsing-from-book"]
 	remote = origin
 	merge = refs/heads/config-file-parsing-from-book
 
+[test]
+	foo1 = alan2
+	foo1 = alan2
+[test "foo"]
+	foo1 = alan3
+	foo1 = alan3
+[test "foo.bar"]
+	foo1 = alan4
+	foo1 = alan4
+[test "foo.bar.baz"]
+	foo1 = alan5
+	foo1 = alan5
+[test "foo.bar.baz.bat"]
+	foo1 = alan6
+	foo1 = alan6
+[test "section.jane"]
+	foo3 = alan3
+	foo3 = alan3