From bfe0f8a09b9d4e3c9bfd6bf5674b8cb6d64a7419 Mon Sep 17 00:00:00 2001
From: John Bintz <hello@theindustriousrabbit.com>
Date: Sun, 17 Mar 2024 13:42:22 -0400
Subject: [PATCH] fix Inet NtoA bugs and release bugs

---
 AMOSPro_BSDSocket.Lib | Bin 5892 -> 6120 bytes
 README.md             |  10 +++++++++-
 bin/release           |   3 +++
 src/BSDSocket.s       |   5 +++--
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/AMOSPro_BSDSocket.Lib b/AMOSPro_BSDSocket.Lib
index 14341093646faa280e4ac5d92a7d950d73e443e2..70f41a4e6d3b07909caabc799e4e8d0d10d66859 100644
GIT binary patch
delta 435
zcmZqCd!au;T=XLY1M^D;238==;0I(2F)#>!o2X+gX~R&%pvNH3aE)OGkThYCVCZ28
zXHaI)-B|aRNtlsAr8qx1JGDe1Bekd~@4dl)hRs#Xzqls{aIsD96XT!U$uG<l?7Vpn
z|2)=u0|_Mt6^4I;-x(Mj(-;`|)O6XBeD0SVC}Hv|RdNV+6uJ?3^8X*9KMV{C4j#`H
z8uYo<a+x@EvVksI_g_yf-se6ei#~&rhXNDW3|9qtuLhtwS_(i_7ydBqQgT)R>SbUw
zxM(6M@KJ#gh?zj<gX{s?F*#9GS_P(7;ed*RK35q-kh7Om8pHozD)Dfc!<&0V<ru@<
zQ%eFoo-^w~#TTh~C;{!c^oMDa!p{bV1|Efz3O|9iF+fQ#WY_+?r55kikj}s$pl0(Q
z2*AE%@GDgloV-X()!tCgP}j)7$i%?d&|E<yIX@*;FC!5cibYAKd3q_SWtt2sVXi?|
P3P5#8DnXV30rMvSL{@=a

delta 200
zcmaE%-=a4`TyzHm1M^D;238==;KRVc^pAl-SZkt=wYW7y4TBzoJi|4H89>s6L4qNS
zA)G;RW5Zvj%@dh_ax>OU?&epYEFdPb`2>F#tIWkeKogksxz%!+ICQcZ82r}#*Her4
zYDi;X;G29*R82s|L7%IPA;{TFDvja)FO~Ss0%CHElY7KvZ4LAcb&U*+j15c-j1@GJ
n^HWmwG7^)sQ;U*H^Yl_u%QP8O!d!!_6b$u{RRXO8y8ROXNES0_

diff --git a/README.md b/README.md
index ed62d2c..e9d6a77 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,15 @@ to contact me.
   null-terminated. They are not.
 * Add `Socket Herrno` to aid in debugging resolver errors.
 
-## Development
+### 1.1.1 (2024-03-17)
+
+* Fix bug in `Socket Inet Ntoa$` where the null terminator on the result of
+  calling `Inet_NtoA` was being included in the AMOS string.
+* Fix crash bug in `Socket Inet Ntoa$` if called with the BSD Socket library
+  was not open.
+
+#
+# Development
 
 ### Environment
 
diff --git a/bin/release b/bin/release
index 3e86847..43a82db 100755
--- a/bin/release
+++ b/bin/release
@@ -35,6 +35,8 @@ FileUtils.rm_rf 'aminet'
 FileUtils.mkdir_p build_dir
 FileUtils.mkdir_p 'aminet'
 
+FileUtils.mv 'src/AMOSPro_BSDSocket.Lib', 'AMOSPro_BSDSocket.Lib' if File.exist?('src/AMOSPro_BSDSocket.Lib')
+
 hackerbun_target = File.expand_path("dist/AMOSPro_BSDSocket_#{version}.lha")
 
 [
@@ -58,6 +60,7 @@ gitignores = File.readlines('.gitignore').map(&:strip)
 
   Dir["#{build_dir}/#{dir}/**/*"].each do |file|
     FileUtils.rm file if gitignores.any? { |gi| File.fnmatch(gi, file) }
+    FileUtils.rm file if [/\.fd$/, /\.i$/].any? { |p| file[p] }
   end
 end
 
diff --git a/src/BSDSocket.s b/src/BSDSocket.s
index 5fa9547..5014c87 100644
--- a/src/BSDSocket.s
+++ b/src/BSDSocket.s
@@ -7,7 +7,7 @@
 ; extension number 18
 ExtNb           equ 18-1
 Version         MACRO
-                dc.b "1.1.0-20240223"
+                dc.b "1.1.1-20240317"
                 ENDM
 VerNumber       equ $1
 
@@ -1186,7 +1186,7 @@ _SocketSelect_PerformSelect
     PreserveStackFunction
     EnsureBSDSocketLibrary _SocketInetNtoa_LibraryOpen
 
-    RestoreStackInstruction
+    RestoreStackFunction
     Ret_Int
 
 _SocketInetNtoa_LibraryOpen:
@@ -1206,6 +1206,7 @@ _SocketInetNtoA_StringSizeLoop:
 
     MOVE.L A0,D3
     SUB.L A2,D3 ; D3 = length
+    SUBQ #1,D3 ; get rid of the null terminator
     Rjsr L_Demande ; string base address is in A0/A1
 
     MOVE.W D3,(A0)+ ; length of string