From 2e1283ddd20eae1b09cfce92d48b160f833ee32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Thu, 27 Oct 2016 10:14:13 +0200 Subject: [PATCH] BUGFIX #5 : TYPE not expanding to full path properly --- A2OSX.BOOT.po | Bin 143360 -> 143360 bytes A2OSX.SRC.po | Bin 819200 -> 819200 bytes SBIN/SHELL.S.CMD.txt | 72 ++++++++++++++++++++++++++++++++----------- SBIN/SHELL.S.txt | 2 ++ 4 files changed, 56 insertions(+), 18 deletions(-) diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index cec3b53dbec4984994b218d7039e2244d667e9fb..e37c7e3aaf9ba40a0c1f4f469ed84890e2d968b2 100644 GIT binary patch delta 595 zcmXX@UuaTM9KP3SDWX`iWwz|7H}!alET|b2yDAMEJ!}tyMy&3W6pVV6Qq!q?I zBZLviU5hz(!YL6wEZ7K5A-D{JAR_6HG@^Nnni|A9cXl2=KECt)e(-%ip{5mT+WdrC zeco=<6|bwW4Vw;7l%5)}JE>0;wXOagnbOjKiuW(Pf%+yZP6FyheloR*t|oed7~aD$ zv&PBYua>w9kUlG1NBGx=*em=@VK3ff#WWegN5G;F#6z*5NEL#z^EHN&asD|*<%EsK zsGfL4ucN!ki!?5NOYT3}r`IJZm{i6w{B1)^xBw3lw9 zccp%U`^s+PEPOu;WldFT37+M7G*lkjWA<41nqJa?4{k!bC6$FIEBWHf@~CTfllAQo zd6JD6BMM@S4sRT!pP-SADhUG`E;IJZP5+f9i``(+1Uu~v7dVkqti1)U&PnU_fbgYakaamjN7euz$ri@#&YdoWaqBz6~XPdnf02h&h#L_LOMOxa9Cb^u$JolL{A}fY_Ws_KUeCS`DB2O0?GQ)m}6S zsAa98!WsjGR_7L{MGTvqJ}93p(Y(O7VrR+Z;~jF0C6k|ZEMeR*xw|u-v1Ie>PFWlC zOB|gHAmF9YuJBCZkfNZbuBNeOtY(ttC5;lz60H*L8f`00cg^b>x++p?jcVfR{OU$3 zyp!#Z$?zF#Y+zr|vhx2#C5Z$D`N^5bT!oV~HmECnRotZX;nISRjY=1o6+9*%JSNF_ zVDjx__CQklxH?~!=G`pK53Hvy{AkeFn?E_=c&zv>b%}%r+!t6CmVp?e7nmdxfJUls zK5{%#O=zFC0o$Skpx+V}rGdz`C6o2vsWO&M4t;kD=oy9gYQiO2AHG}U?bBYXuCPW; z!6!`#s3!7#EO&|4N!t%nr#`6dEt!1qy%;b6ZoFRwB%41dvjFwPPu}-I${na_lFBia zwQ4|W5eq2TO+n#zt838|Ag9%_#bK$_1-7NmAB2xNA9LE|u*d-@{LJCP%V&-aPcy)w lE|IYE{AQPrdzdB*Fj;Q;BCvqTL}5Fl592%LWiuFO001~r(2@WE diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index fcc265fd6ac135967eae6fa8d302d0d71596ba81..c24bf8069fcd2f4422a8a414b47815718e452c06 100644 GIT binary patch delta 1681 zcmZ`)TWlLe6uq;~CR^J{YA1G+5E0r$C<*Dx4j)a03No?XgeHyab)l|Q(AwT$Bgb~v z8!6$(8QQuMkMa?ztNq}sQq&)m(m+z)rRCK^-*3t*yg@w6OB70&^{gE$fPXx5@0oM& zxpVLA#605=^X1|cl;dIkpYdP(t*CX)eC ziHAMV^gPlc(JbyAiSfQMDa!kL`-b>nNC5T)q=D^4{bYzxZ4CrMK{wc6LRwZC!|@^q zurCwbidP6OuvzH4uOGX1s(0Lr%;;5h8|GG`!)gw5PKW)qBBDs;Jc3mB6spf1r77@h zd%*s>K_8OF6n`Qq0s97_uYMD0Qd-8XZNtN0drQZNl&1SOH*jwwO&J%V`dAsN<#;)2 zXI4qe5*{Xucx6&b0rxIBGbTdA2{bvs!I?X$i#@eOEPI+*EoYFHjE&<~7qp$#mm+R; z-@Yp`j0w*=R~MGX5(>`9iIjqSgTS8Cna(5LttL`YBT2AaAR1E==DWdm5owDalD_2< z(op1}a}Q(L)C~Hs6+WGw)EZ`M>@al;+|yE1M=V=~nQe{xI&;!?%=Z9$nS`mkg7|J# z�YVPY2Y!r)w~-x_4+)@qqPevA%17eV-g_`+&+Q9@_Dsq~N5ORd6&e$~ck29$-Ht zz}k<>QYDFgOo(#23OCs1%U!yPPl!_%bzkRai0@IOBNOok3p&uW8g8Ch@R9jqCg&Z^ImFPGZ0m7>onZ=-(Vp>&irCRL4xEXh>MNLndX8lZ z!I~?XQZV0^{?P71hez}!R96)#{eG}>|Ds%GP?~j0HVd4EnZe!%&?CXwAhI9bRCf%O zUWdo{y9Mlqy5p!+U&F+`LuFgYAoAYLgM(o(pCHSjAa;TEB=QQp5b^{=&~Zv#=V01% zr%}Y0jSi+`(&LnL`56=mh@)9)58cK#h?hWw9Gh~ol^ zlQQ%r^w(kBplP_M--BVJwRJ)L{@rFLGiP?1D)XpawLQ#Sn=?ISy0K~l-|yX$r*sXM z%1-jWjb6iEe;LL5Q<>4igJy&_U(pp33~*#(c^~<|I*FcMm|V`x&K@zb(~V90>1-_C zlm0Rb;f-qT_6niVF}>I>g*TgcV8sEXsrU&~edHP1WR8PNQ2NWx%@_^!EWLuJ=N3Vs taKJ~JLBxd*N7L;8511 zFJ=^JD@AR3u$0vva%m;hOO-S<&{loWq^(K=;Z0tIkdQ~;&AFF$)-x6*-P8Q@e~*9v z`Dez*J>%n^3*|PnIay)*d(VNG7zjuFuZmHq`3xB^MS5ZrXs91O0i(ijKx}%;`+1!w-;5PLJCaj|v3LZ8?~##IWX2*n z;Rhso^qnmbex&T?Vu9`!*gK1&q~>_6(;E!p&hSXi3yzmD#NaA3Cwg=L&6wu% zB&SMPbVKC=5|8MalmyPjg5f3?uQ)eu-iMplu5Uq_^E zXU!~k9ktFJdLD!usPnC)=pR*NG3xjFfV;_LZc!QTHU&0qpaP0CTJIp^qVtS}Z)*he zbHVmn!Kk0A5HYdi;G|-S4E5W7ySiF2TM{o9Q|j2tdt)|4BY%l8=}qdR#ys|5K>8;12?o zXJ16+`Knnk#E=&kCyVqQipQ6Ufvv*yE~Y=9=#b275tRq10yT+XDP56-cN4LyHvV_*kWq;sM?|X(27qeX+@P% zxHla2;gFOb%#5U@+~81}1hP6r#%i1W@&oD}^u@hhV0&n~kKw$F_}CuNe|mwexyQ`p zXGZ&_MDz9$+OHH@Wc_BYM{$w$J7fJpS@u6mthg8Kf04i!#tGLk4^%&)3g(d>PIykC z=roEV;Yu4fOUI2TS5NfyghFwsB-c(1M{zsY=8!KY#=5=HZfKd;#wN?EK Du59D# diff --git a/SBIN/SHELL.S.CMD.txt b/SBIN/SHELL.S.CMD.txt index c38146fb..3e1b8348 100644 --- a/SBIN/SHELL.S.CMD.txt +++ b/SBIN/SHELL.S.CMD.txt @@ -421,53 +421,89 @@ Cmd.Exec.TIME clc rts *-------------------------------------- Cmd.Exec.ECHO lda ARGS - beq .9 + beq Cmd.Exec.ECHO.SYN >PUSHW L.ARGS >LDYA L.MSG.PSTR >SYSCALL PrintFYA clc rts -.9 lda #SYSMGR.ERRSYN +Cmd.Exec.ECHO.SYN + lda #SYSMGR.ERRSYN sec +Cmd.Exec.ECHO.RTS rts *-------------------------------------- Cmd.Exec.TYPE lda ARGS - beq .98 + beq Cmd.Exec.ECHO.SYN + >LDYA L.ARGS + >SYSCALL GetFullPathYA + bcs Cmd.Exec.ECHO.RTS + + >STYA ZPPTR1 + stx hFullPath + >PUSHWI 0 Aux type >PUSHBI 4 S.FILEINFO.TYPE.TXT >PUSHBI SYS.FOPEN.R - >PUSHW L.ARGS + >PUSHW ZPPTR1 >SYSCALL LoadFile - bcs .99 + bcs .98 + stx hTextFile + + eor #$ff + sta ZPPTR2+1 + tya + eor #$ff + sta ZPPTR2 store file !len - >STYA ZPPTR2 store file len - phx txa >SYSCALL GetMemPtrA + >STYA ZPPTR1 -.1 lda ZPPTR2 + + ldy #0 + lda #13 if len=0, exit print CR + +.1 inc ZPPTR2 bne .2 - lda ZPPTR2+1 - beq .3 - dec ZPPTR2+1 -.2 dec ZPPTR2 - - lda (ZPPTR1) + inc ZPPTR2+1 + beq .8 + +.2 lda (ZPPTR1) >SYSCALL COutA + bcs .97 + + lda (ZPPTR1) get last char in A + inc ZPPTR1 bne .1 inc ZPPTR1+1 bra .1 -.3 pla - >SYSCALL FreeMemA +.8 cmp #13 is last char printed a CR ? + beq .81 + lda #13 + >SYSCALL COutA no, add one + bcs .97 + +.81 jsr .97 cleanup... + clc rts -.98 lda #SYSMGR.ERRSYN +.97 pha + lda hTextFile + >SYSCALL FreeMemA + pla + +.98 pha + lda hFullPath + >SYSCALL FreeMemA + pla + sec -.99 rts + rts *-------------------------------------- Cmd.Exec.READ clc diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index 31a240af..661719e9 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -454,6 +454,8 @@ STAT .BS S.STAT hNEWPATH .BS 1 hCmdLine .BS 1 Cmd.Exec.Mode .BS 1 +hFullPath .BS 1 +hTextFile .BS 1 *-------------------------------------- .DUMMY .OR 0