diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx index 89e56de5..46bff568 100644 Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 334fde9f..242c3134 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 4ce96aa9..6a886720 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -66,7 +66,7 @@ CS.RUN.IPOK ldy #S.PS.ARGC bne .1 jmp CS.RUN.DUMP -.1 cmp #3 +.1 cmp #2 beq CS.RUN.ADD >PUSHBI 0 diff --git a/BIN/SHELL.S.CMD.txt b/BIN/SHELL.S.CMD.txt index 16fafce4..bf57e083 100644 --- a/BIN/SHELL.S.CMD.txt +++ b/BIN/SHELL.S.CMD.txt @@ -587,15 +587,17 @@ Cmd.INT.WHILE Cmd.INT.IF jsr CMD.StkGet bcs .1 no context... - and #$40 parent is true ? + and #$80 get current.. + lsr becomes parent bra .2 -.1 lda #$40 +.1 lda #$40 ...set Parent = true .2 >STA.G CMD.Test - bit #$40 + bit #$40 Parent is true ? beq .3 + jsr Cmd.Eval bcs .9 @@ -617,7 +619,7 @@ Cmd.INT.ELSE jsr CMD.StkGet bcs .9 bit #$40 parent is true ? - beq .8 yes, skip + beq .8 no, skip tax and #$3F diff --git a/SYS/KERNEL.S.PS.txt b/SYS/KERNEL.S.PS.txt index b50fe187..7e3d0dde 100644 --- a/SYS/KERNEL.S.PS.txt +++ b/SYS/KERNEL.S.PS.txt @@ -59,9 +59,10 @@ K.ExecV >STYA PS.ArgV PS.Exec stz PS.Load.hBIN - jsr PS.CreateChild Child S.PS at ZPPtr3,PS.Load.hMem + jsr PS.CreateChild A=PID,Child S.PS at ZPPtr3,PS.Load.hMem bcs .9 - + sta .8+1 + jsr PS.Load bcs .90 jsr PS.AddArgV @@ -79,7 +80,7 @@ PS.Exec stz PS.Load.hBIN sec rts -.8 lda PS.Load.hMem +.8 lda #$ff SELF MODIFIED .9 rts *-------------------------------------- * PS.CreateChild diff --git a/SYS/KERNEL.S.STDLIB.txt b/SYS/KERNEL.S.STDLIB.txt index 9475e103..c8b46287 100644 --- a/SYS/KERNEL.S.STDLIB.txt +++ b/SYS/KERNEL.S.STDLIB.txt @@ -335,7 +335,7 @@ K.realpath.I clc bne .4 *-------------------------------------- * X=LEN, K.Buf256 = /dir1../file(/) /x0 - +*-------------------------------------- dex beq .89 we have '/'....nothing to do... @@ -368,14 +368,24 @@ K.realpath.I clc dey "/." ? bne .9 no.. - jsr K.RealPath.RemoveAtX we found "/.", remove,useless.... + lda K.Buf256+2,x + beq .12 + cmp #'/' "/./" ? + bne .80 + +.12 jsr K.RealPath.RemoveAtX we found "/./", remove,useless.... bra .80 .9 dey "/.." ? bne .90 "/..." ??!!...mmm...syntax error - txa we found "/.." + lda K.Buf256+3,x + beq .11 + cmp #'/' "/../" ? + bne .80 + +.11 txa we found "/../" beq .90 at the beginning of string...cannot remove /dir/.. jsr K.RealPath.RemoveAtX remove "/.." @@ -392,7 +402,7 @@ K.realpath.I clc beq .89 Empty path!!! go put back "/" an exit dex bra .5 - +*-------------------------------------- .89 lda #$ff SELF MODIFIED bpl .98 >LDYAI K.Buf256 diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index cff4a26d..cf2695bc 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -35,7 +35,6 @@ A2osX.D1 .PH $D000 .INB USR/SRC/SYS/KERNEL.S.DIRENT .INB USR/SRC/SYS/KERNEL.S.STDIO .INB USR/SRC/SYS/KERNEL.S.STDLIB - .INB USR/SRC/SYS/KERNEL.S.PFT .INB USR/SRC/SYS/KERNEL.S.DEV .EP A2osX.D2 .PH $D000 @@ -52,6 +51,7 @@ A2osX.E0 .PH $E000 .INB USR/SRC/SYS/KERNEL.S.IRQ .INB USR/SRC/SYS/KERNEL.S.MEM ********* TMP ***** go to A2osX.D1 + .INB USR/SRC/SYS/KERNEL.S.PFT .INB USR/SRC/SYS/KERNEL.S.FIO .INB USR/SRC/SYS/KERNEL.S.IO ********* TMP ***** go to A2osX.D2 diff --git a/X.M32.S.txt b/X.M32.S.txt index 6e45808c..78ff59ac 100644 --- a/X.M32.S.txt +++ b/X.M32.S.txt @@ -139,3 +139,5 @@ M32.Cmp ldx #4 *-------------------------------------- MAN SAVE USR/SRC/X.M32.S +LOAD USR/SRC/BIN/SHELL.S +ASM