diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index cf0c6288..50a6cc1d 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index d5c40420..eef1f310 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.DEV.po b/.Floppies/A2OSX.DEV.po index 40d57be6..8727a5fd 100644 Binary files a/.Floppies/A2OSX.DEV.po and b/.Floppies/A2OSX.DEV.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index b67f2331..0d4a2881 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index 9f24f7e0..28ef4ccf 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -20,10 +20,10 @@ X.DELETE.SOURCE .EQ 0 *-------------------------------------- CS.END *-------------------------------------- -OptionList >PSTR "CRY" -OptionVars .DA #bContinue,#bRecurse,#bNoConfirm +OptionList >PSTR "CRYQcryq" +OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" +MSG.USAGE >CSTR "Usage : CP [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" MSG.DIR >CSTR "CP Dir :%S%S to %S%S..." MSG.FILE >CSTR "CP File:%S%S to %S%S..." MSG.OVERWRTE >CSTR "Overwrite [Yes,No,All]?" @@ -55,6 +55,7 @@ RC .BS 1 bContinue .BS 1 bRecurse .BS 1 bNoConfirm .BS 1 +bQuiet .BS 1 Count .BS 2 DS.END .ED diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index 0a7d867f..9b46b402 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -20,10 +20,10 @@ X.DELETE.SOURCE .EQ 1 *-------------------------------------- CS.END *-------------------------------------- -OptionList >PSTR "CRY" -OptionVars .DA #bContinue,#bRecurse,#bNoConfirm +OptionList >PSTR "CRYQcryq" +OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" +MSG.USAGE >CSTR "Usage : MV [Src File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n -Y : Dont't prompt for override\r\n" MSG.DIR >CSTR "MV Dir :%S%S to %S%S..." MSG.FILE >CSTR "MV File:%S%S to %S%S..." MSG.OVERWRTE >CSTR "Overwrite [Yes,No,All]?" @@ -55,6 +55,7 @@ CopyRC .BS 1 bContinue .BS 1 bRecurse .BS 1 bNoConfirm .BS 1 +bQuiet .BS 1 Count .BS 2 DS.END .ED diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 4fc5a244..2957af3a 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -20,10 +20,10 @@ X.DELETE.SOURCE .EQ 1 *-------------------------------------- CS.END *-------------------------------------- -OptionList >PSTR "CRY" -OptionVars .DA #bContinue,#bRecurse,#bNoConfirm +OptionList >PSTR "CRYQcryq" +OptionVars .DA #bContinue,#bRecurse,#bNoConfirm,#bQuiet,#bContinue,#bRecurse,#bNoConfirm,#bQuiet *-------------------------------------- -MSG.USAGE >CSTR "Usage : RM [File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -R : Recurse subdirectories\r\n" +MSG.USAGE >CSTR "Usage : RM [File/Dir, *,? wildcards allowed]\r\n -C : Continue on error\r\n -Q : Quiet\r\n -R : Recurse subdirectories\r\n" MSG.DIR >CSTR "RM Dir :%S%S..." MSG.FILE >CSTR "RM File:%S%S..." MSG.OK >PSTR "[OK]\r\n" @@ -54,6 +54,7 @@ CopyRC .BS 1 bContinue .BS 1 bRecurse .BS 1 bNoConfirm .BS 1 +bQuiet .BS 1 Count .BS 2 DS.END .ED diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index da74d776..0070c04a 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -274,14 +274,18 @@ CS.RUN.LEAVE jsr LeaveSubDir exit this sub dir.... jmp CS.RUN.NEXT -.99 ldy #Count+1 +.99 ldy #bQuiet + lda (pData),y + bmi .91 + + ldy #Count+1 >PUSHB (pData),y dey >PUSHB (pData),y >LDYA L.MSG.DONE >SYSCALL PPrintFYA - ldy #RC +.91 ldy #RC lda (pData),y get global RC in case of bContinue sec .9 rts @@ -362,27 +366,14 @@ CS.RUN.DIR .DO X.COPY.TO.DEST=1 sec CS.RUN.DIR.RTS rts *-------------------------------------- -CS.RUN.FILE .DO X.COPY.TO.DEST=1 - >PUSHW ZPFileName - - ldy #hDstBasePath +CS.RUN.FILE ldy #bQuiet lda (pData),y - >SYSCALL GetMemPtrA - >PUSHYA - .FIN + bmi .14 - >PUSHW ZPFileName - - ldy #hSrcBasePath - lda (pData),y - >SYSCALL GetMemPtrA - >PUSHYA - - >LDYA L.MSG.FILE - >SYSCALL CPrintFYA + jsr CS.RUN.FILE.MSG bcs CS.RUN.DIR.RTS - .DO X.COPY.TO.DEST=1 +.14 .DO X.COPY.TO.DEST=1 ldy #hDstBasePath jsr CS.RUN.GetFilePath @@ -396,7 +387,14 @@ CS.RUN.FILE .DO X.COPY.TO.DEST=1 lda (pData),y bmi .2 no prompt, ovverwrite - >LDYA L.MSG.OVERWRTE + ldy #bQuiet + lda (pData),y + bpl .15 + + jsr CS.RUN.FILE.MSG + bcs .90 + +.15 >LDYA L.MSG.OVERWRTE >SYSCALL CPrintFYA bcs .9 @@ -410,7 +408,7 @@ CS.RUN.FILE .DO X.COPY.TO.DEST=1 bne .11 jmp CS.RUN.CR.NEXT no overwrite exit - rts +.90 rts .11 cmp #'Y' beq .12 copy @@ -465,6 +463,26 @@ CS.RUN.FILE .DO X.COPY.TO.DEST=1 lda (pData),y get global RC in case of bContnue sec rts +*-------------------------------------- +CS.RUN.FILE.MSG .DO X.COPY.TO.DEST=1 + >PUSHW ZPFileName + + ldy #hDstBasePath + lda (pData),y + >SYSCALL GetMemPtrA + >PUSHYA + .FIN + + >PUSHW ZPFileName + + ldy #hSrcBasePath + lda (pData),y + >SYSCALL GetMemPtrA + >PUSHYA + + >LDYA L.MSG.FILE + >SYSCALL CPrintFYA + rts *-------------------------------------- .DO X.COPY.TO.DEST=1 .DO X.DELETE.SOURCE=1 @@ -563,10 +581,17 @@ CS.RUN.Copy stz .90+1 lda .90+1 >SYSCALL FreeMemA + ldy #bQuiet + lda (pData),y + bmi .8 + lda #'.' >SYSCALL PutCA rts +.8 clc + rts + .9 ldy #CopyRC sta (pData),y @@ -615,7 +640,11 @@ CS.RUN.CheckErr bcs .1 inc sta (pData),y -.10 >LDYA L.MSG.OK +.10 ldy #bQuiet + lda (pData),y + bmi .8 + + >LDYA L.MSG.OK >SYSCALL PPrintFYA rts @@ -641,9 +670,10 @@ CS.RUN.CheckErr bcs .1 >SYSCALL PutCA pla sec - rts - .9 rts + +.8 clc + rts *-------------------------------------- CS.RUN.GetFilePath lda (pData),y diff --git a/README.md b/README.md index ca67f2bd..5efd05f7 100644 --- a/README.md +++ b/README.md @@ -130,7 +130,7 @@ note : '$VAR' does NOT expand Variable | SSC.I.DRV | Working | Apple "Super Serial Card" Driver (IRQ enabled) | 0.9 | | PIC.DRV | In Progress | Apple "Parallel Interface Card" Driver, renamed from PPIC.DRV | 0.9 | | Mouse.DRV | Working | Apple Mouse Card,//c Mouse Port | 0.9 | -| DHGR.DRV | In Progress | except bitblt... | 0.8 | +| DHGR.DRV | In Progress | except bitblt... | 0.9 | | ---- | ------ | ------- | ----- | | LanCeGS.DRV | Working | | 0.9 | | Uthernet.DRV | Working | | 0.9 | @@ -148,11 +148,14 @@ note : '$VAR' does NOT expand Variable | | | -L : long listing with size/date... | | | | | -R : Recurse subdirectories | | | RM | Working | -C : Continue On Error | 0.9 | +| | | -Q : Quiet | | | | | -R : Recurse subdirectories | | | CP | Working | -C : Continue On Error | 0.9 | +| | | -Q : Quiet | | | | | -R : Recurse subdirectories | | | | | -Y : Dont't Prompt For Override | | | MV | Working | -C : Continue On Error | 0.9 | +| | | -Q : Quiet | | | | | -R : Recurse subdirectories | | | | | -Y : Dont't Prompt For Override | | | CAT | Working | -A : Show All non printable caracters | 0.9 | diff --git a/SYS/KERNEL.S.FIO.txt b/SYS/KERNEL.S.FIO.txt index 108eccd7..50828382 100644 --- a/SYS/KERNEL.S.FIO.txt +++ b/SYS/KERNEL.S.FIO.txt @@ -58,7 +58,7 @@ K.FileSearch >PULLW ZPPtr4 ZPPtr1 trashed by ExpandPStrYA bne .4 stx KrnBuf256 set string length - + >PUSHWI K.S.STAT >PUSHWI KrnBuf256 jsr K.STAT diff --git a/_MAKEBOOT.txt b/_MAKEBOOT.txt index 23e7d6bd..e7dd0453 100644 --- a/_MAKEBOOT.txt +++ b/_MAKEBOOT.txt @@ -5,23 +5,23 @@ AUTO 6 PREFIX /A2OSX.BUILD echo \fBuilding A2OSX.BOOT Media... format S6D1 A2OSX.BOOT -cp ProDOS /A2OSX.BOOT +echo Copying Files... +cp -q ProDOS /A2OSX.BOOT md /A2OSX.BOOT/SYS -cp SYS/* /A2OSX.BOOT/SYS +cp -q SYS/* /A2OSX.BOOT/SYS md /A2OSX.BOOT/DRV -cp DRV/* /A2OSX.BOOT/DRV +cp -q DRV/* /A2OSX.BOOT/DRV md /A2OSX.BOOT/LIB -cp LIB/* /A2OSX.BOOT/LIB +cp -q LIB/* /A2OSX.BOOT/LIB md /A2OSX.BOOT/SBIN -cp SBIN/* /A2OSX.BOOT/SBIN +cp -q SBIN/* /A2OSX.BOOT/SBIN md /A2OSX.BOOT/BIN -cp BIN/* /A2OSX.BOOT/BIN +cp -q BIN/* /A2OSX.BOOT/BIN md /A2OSX.BOOT/ETC -md /A2OSX.BOOT/SRV -md /A2OSX.BOOT/USR -cp A2OSX.SYSTEM /A2OSX.BOOT +echo Done! +cp -q A2OSX.SYSTEM /A2OSX.BOOT chtyp /A2OSX.BOOT/A2OSX.SYSTEM SYS -cp A2OSX.STARTUP /A2OSX.BOOT +cp -q A2OSX.STARTUP /A2OSX.BOOT MAN TEXT MAKEBOOT diff --git a/_MAKEDEV.txt b/_MAKEDEV.txt index 07c652d6..7da6dde6 100644 --- a/_MAKEDEV.txt +++ b/_MAKEDEV.txt @@ -5,9 +5,11 @@ AUTO 6 PREFIX /A2OSX.BUILD echo \fBuilding A2OSX.DEV Media... format S6D2 A2OSX.DEV +echo Copying Files... md /A2OSX.DEV/BIN -cp BIN/DEV/* /A2OSX.DEV/BIN +cp -q BIN/DEV/* /A2OSX.DEV/BIN md /A2OSX.DEV/INC -cp INC/* /A2OSX.DEV/INC +cp -q INC/* /A2OSX.DEV/INC +echo Done! MAN TEXT MAKEDEV