diff --git a/AMOSPro_BSDSocket.Lib b/AMOSPro_BSDSocket.Lib index 1434109..70f41a4 100644 Binary files a/AMOSPro_BSDSocket.Lib and b/AMOSPro_BSDSocket.Lib differ 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