diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 6a998985..346190de 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index afa77078..bd96ff10 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -176,7 +176,7 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." SSCANF.IP .AZ "%d.%d.%d.%d" diff --git a/BIN/HTTPGET.S.txt b/BIN/HTTPGET.S.txt index 7bbac9f3..8913b7e7 100644 --- a/BIN/HTTPGET.S.txt +++ b/BIN/HTTPGET.S.txt @@ -477,7 +477,7 @@ Wait.TimeOut sec .9 rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." MSG.USAGE .AS "Usage : HTTPGET [port]\r\n" diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index 5d1c79f0..22d82a24 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -344,7 +344,7 @@ Wait.TimeOut ldy #TimeOut .INB USR/SRC/SBIN/IPCONFIG.S.ETC *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 *-------------------------------------- OptionList >PSTR "DEde" diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index 4cb1840b..0fa7e6df 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -159,7 +159,7 @@ CS.QUIT lda hLIBTCPIP rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +libtcpip .az "libtcpip" hLIBTCPIP .BS 1 MSG0 .AZ "Type Prot Local Remote Options Status" MSG1 .AZ "%s %s %03d.%03d.%03d.%03d:%05D %03d.%03d.%03d.%03d:%05D %b %s\r\n" diff --git a/BIN/PAKME.S.txt b/BIN/PAKME.S.txt index 60fbfd26..bfac5c28 100644 --- a/BIN/PAKME.S.txt +++ b/BIN/PAKME.S.txt @@ -554,7 +554,7 @@ MSG.STORE .AZ "Store : %5D Bytes, New Ofs=$%H\r\n" MSG.E.IARC .AZ "Invalid/corrupt archive" TAG .AZ "PAKME" *-------------------------------------- -LIBPAK .AZ "LIBPAK" +LIBPAK .AZ "libpak" hLIB .BS 1 *-------------------------------------- .DUMMY diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index 4947bf2a..1105f6d5 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -354,7 +354,7 @@ CS.QUIT lda hFrame rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." MSG.USAGE .AS "Usage : PING \r\n" .AZ " -1-9 : Ping Count\r\n" diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index e3e37937..82e0a530 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -216,7 +216,7 @@ DumpRPCFrame lda #S.UDP+24 .9 rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 MSG.USAGE .AZ "Usage : RPCDUMP " MSG.UNKNOWN .AZ "%s: Unknown host\r\n" diff --git a/BIN/TELNET.S.txt b/BIN/TELNET.S.txt index b3f2318c..9b9dc570 100644 --- a/BIN/TELNET.S.txt +++ b/BIN/TELNET.S.txt @@ -287,7 +287,7 @@ CS.QUIT lda hSocket rts *-------------------------------------- CS.END -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." MSG.USAGE .AZ "Usage : TELNET [port]" diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index ada7b84a..83609d6e 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -150,7 +150,7 @@ FD.DEV .DA #S.FD.T.CDEV .BS 2 DRVPTR .DA 0 DCBPTR .DA 0 BUFPTR -FD.DEV.NAME .AZ "ETH7" +FD.DEV.NAME .AZ "eth7" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/UTHERNET.DRV.S.txt b/DRV/UTHERNET.DRV.S.txt index 694b7d0f..73284b44 100644 --- a/DRV/UTHERNET.DRV.S.txt +++ b/DRV/UTHERNET.DRV.S.txt @@ -156,7 +156,7 @@ FD.DEV .DA #S.FD.T.CDEV .BS 2 DRVPTR .DA 0 DCBPTR .DA 0 BUFPTR -FD.DEV.NAME .AZ "ETH7" +FD.DEV.NAME .AZ "eth7" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/X.SSC.DRV.S.txt b/DRV/X.SSC.DRV.S.txt index 666dbaac..d2a5b089 100644 --- a/DRV/X.SSC.DRV.S.txt +++ b/DRV/X.SSC.DRV.S.txt @@ -176,7 +176,7 @@ FD.DEV .DA #S.FD.T.CDEV .BS 2 DRVPTR .DA 0 DCBPTR .DA 0 BUFPTR -FD.DEV.NAME .AZ "COM1" +FD.DEV.NAME .AZ "com1" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/DRV/X.U2.DRV.S.txt b/DRV/X.U2.DRV.S.txt index a618db30..d5cac976 100644 --- a/DRV/X.U2.DRV.S.txt +++ b/DRV/X.U2.DRV.S.txt @@ -178,7 +178,7 @@ FD.DEV .DA #S.FD.T.CDEV .BS 2 DRVPTR .DA 0 DCBPTR .DA 0 BUFPTR -FD.DEV.NAME .AZ "ETH7" +FD.DEV.NAME .AZ "eth7" *-------------------------------------- * Driver Code *-------------------------------------- diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt index e57a5054..2f6bb21c 100644 --- a/LIB/LIBBLKDEV.S.txt +++ b/LIB/LIBBLKDEV.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBBLKDEV + .TF lib/libblkdev *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I diff --git a/LIB/LIBCRYPT.S.txt b/LIB/LIBCRYPT.S.txt index 21b3b18a..00f8e1a9 100644 --- a/LIB/LIBCRYPT.S.txt +++ b/LIB/LIBCRYPT.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBCRYPT + .TF lib/libcrypt *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I diff --git a/LIB/LIBETALK.S.txt b/LIB/LIBETALK.S.txt index 6378a1b9..539aaef6 100644 --- a/LIB/LIBETALK.S.txt +++ b/LIB/LIBETALK.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBETALK + .TF lib/libetalk *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 27b2b6f9..2daa43ff 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/GUI/LIBGUI + .TF lib/libgui *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt index 60bc4dbb..9ffb9d58 100644 --- a/LIB/LIBPAK.S.txt +++ b/LIB/LIBPAK.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBPAK + .TF lib/libpak *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 23d9b32b..214ae568 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -3,7 +3,7 @@ NEW .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBTCPIP + .TF lib/libtcpip *-------------------------------------- AUXPIPE .EQ 1 IPDEBUG .EQ 0 diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt index a3c09323..5b60fb57 100644 --- a/SBIN/HTTPD.S.txt +++ b/SBIN/HTTPD.S.txt @@ -342,7 +342,7 @@ CS.QUIT lda hSrvSocket CS.END *-------------------------------------- hLIBTCPIP .BS 1 -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" MSG.TCPWAIT .AZ "HTTPD:Waiting for TCP/IP initializing..." MSG.TCPIPERR .AZ "HTTPD:TCP/IP Not initialized properly." MSG.INITOK .AZ "HTTPD:Listening on port %D, root dir: %s.\r\n" diff --git a/SBIN/LOGIN.S.txt b/SBIN/LOGIN.S.txt index 8f62ca00..a6ec74b6 100644 --- a/SBIN/LOGIN.S.txt +++ b/SBIN/LOGIN.S.txt @@ -473,7 +473,7 @@ CS.CLEANUP.hPW lda ZPhPW *-------------------------------------- CS.END *-------------------------------------- -LIBCRYPT .AZ "LIBCRYPT" +LIBCRYPT .AZ "libcrypt" hLIBCRYPT .BS 1 MSG.NOAUTH .AS "\r\n\r\nA2osX-Login:No ETC/PASSWD file present, Logged as ROOT.\r\n" .AS "Consider adding ROOT password with USERADD command.\r\n" diff --git a/SBIN/NETWORKD.S.txt b/SBIN/NETWORKD.S.txt index 97dd6669..98e2743b 100644 --- a/SBIN/NETWORKD.S.txt +++ b/SBIN/NETWORKD.S.txt @@ -263,7 +263,7 @@ ETCNETWORK .AZ "${BOOT}ETC/NETWORK" DevID .BS 1 LibCnt .BS 1 hLIBs .BS LIB.MAX+1 for ending 0 if MAX libs -DEVNAME .AZ "/DEV/ETH1" +DEVNAME .AZ "/dev/eth1" IOCTL .BS S.IOCTL DCB.NIC .BS S.DCB.NIC *-------------------------------------- diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index 3f38fc19..8bf7030f 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -234,7 +234,7 @@ CS.QUIT lda hSrvSocket CS.END *-------------------------------------- hLIBTCPIP .BS 1 -LIBTCPIP .AZ "LIBTCPIP" +LIBTCPIP .AZ "libtcpip" MSG.TCPWAIT .AZ "TELNETD:Waiting for TCP/IP initializing..." MSG.INITOK .AZ "TELNETD:Init Ok, Listening." MSG.TCPIPERR .AZ "TELNETD:TCP/IP Not initialized properly." diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 3a6f9eea..654264be 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -106,7 +106,26 @@ BIN.Load.Cleanup.RTS * Y,A = MEMPTR * X = hMem of Code Segment *-------------------------------------- -BIN.Load ldx #0 +BIN.Load lda CORE.FSID + bne .11 + + ldx #$ff + +.10 inx + lda K.Buf256,x + beq .11 + + cmp #'a' + bcc .10 + + cmp #'z'+1 + bcs .10 + + eor #$20 + sta K.Buf256,x + bra .10 + +.11 ldx #0 .1 cpx Mem.LastSlot beq BIN.Load.1 @@ -116,19 +135,24 @@ BIN.Load ldx #0 jsr MEM.GetMemByID lda (ZPMemMgrSPtr) bpl .1 In Use? + ldy #S.MEM.BIN any BIN PATH in this slot? lda (ZPMemMgrSPtr),y beq .1 + jsr K.GetMemPtr X unmodified, get pathname >STYA .3+1 ldy #0 + .2 lda K.Buf256,y .3 cmp $ffff,y SELF MODIFIED bne .1 + iny ora #0 bne .2 + stx BIN.hMem save hMem txa jsr MEM.GetMemByID @@ -173,10 +197,11 @@ BIN.Load.1 >LDYA K.S.STAT+S.STAT.P.AUXTYPE ply jsr BIN.ComputeCSEndYA jsr BIN.RelExe + >LDYAI K.Buf256 get back bin path - ldx #SYS.strdup make a copy of this string - jsr K.SYSCALL2 + >SYSCALL2 strdup make a copy of this string bcs .98 + lda BIN.hMem Keep X=new string hMem jsr MEM.GetMemByID X unmodified lda (ZPMemMgrSPtr) diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 5de2c2d9..b8bf7788 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -197,10 +197,10 @@ KConfigLoad >LDYAI MSG.KCREAD .DA #MLIGETFILEINFOEX .DA MLIGETFILEINFOEX00 bcc .1 - cmp #MLI.E.BADCALL + eor #MLI.E.BADCALL beq .2 -.1 inc CORE.FSID +.1 ror CORE.FSID ProDOS.FX detected bra .9 .2 jsr MLI @@ -1155,7 +1155,7 @@ RAMx .AZ "/RAMx" I.ENV.BOOT .AZ "BOOT" I.ENV.ROOT .AZ "ROOT" I.ENV.PATH .AZ "PATH=${BOOT}SBIN/:${BOOT}BIN/" -I.ENV.LIB .AZ "LIB=${BOOT}LIB/" +I.ENV.LIB .AZ "LIB=${BOOT}lib/" I.ENV.DRV .AZ "DRV=${BOOT}DRV/" CTRLR.SHELL .AZ "${BOOT}BIN/SH" ETCINIT.CMDLINE .AZ "${ROOT}ETC/INIT"