TheIndustriousRabbit
/
amos-pro-bsdsocket-extension
1
0
Fork 0
Code Issues Pull Requests Projects Releases 6 Wiki Activity

fix Inet NtoA bugs and release bugs

This commit is contained in:
John Bintz 2024-03-17 13:42:22 -04:00
parent a6500640fa
commit bfe0f8a09b
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
AMOSPro_BSDSocket.Lib
View File

Binary file not shown.

10
README.md
View File

@ -190,7 +190,15 @@ to contact me.
null-terminated. They are not. null-terminated. They are not.
* Add `Socket Herrno` to aid in debugging resolver errors. * 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 ### Environment

3
bin/release
View File

@ -35,6 +35,8 @@ FileUtils.rm_rf 'aminet'
FileUtils.mkdir_p build_dir FileUtils.mkdir_p build_dir
FileUtils.mkdir_p 'aminet' 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") 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| Dir["#{build_dir}/#{dir}/**/*"].each do |file|
FileUtils.rm file if gitignores.any? { |gi| File.fnmatch(gi, file) } FileUtils.rm file if gitignores.any? { |gi| File.fnmatch(gi, file) }
FileUtils.rm file if [/\.fd$/, /\.i$/].any? { |p| file[p] }
end end
end end

5
src/BSDSocket.s
View File

@ -7,7 +7,7 @@
; extension number 18 ; extension number 18
ExtNb equ 18-1 ExtNb equ 18-1
Version MACRO Version MACRO
dc.b "1.1.0-20240223" dc.b "1.1.1-20240317"
ENDM ENDM
VerNumber equ $1 VerNumber equ $1
@ -1186,7 +1186,7 @@ _SocketSelect_PerformSelect
PreserveStackFunction PreserveStackFunction
EnsureBSDSocketLibrary _SocketInetNtoa_LibraryOpen EnsureBSDSocketLibrary _SocketInetNtoa_LibraryOpen
RestoreStackInstruction RestoreStackFunction
Ret_Int Ret_Int
_SocketInetNtoa_LibraryOpen: _SocketInetNtoa_LibraryOpen:
@ -1206,6 +1206,7 @@ _SocketInetNtoA_StringSizeLoop:
MOVE.L A0,D3 MOVE.L A0,D3
SUB.L A2,D3 ; D3 = length 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 Rjsr L_Demande ; string base address is in A0/A1
MOVE.W D3,(A0)+ ; length of string MOVE.W D3,(A0)+ ; length of string