Kernel 0.92

BIN/CHTYP.S.txt

@@ -8,6 +8,7 @@ AUTO 4,1
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
+				.INB INC/MLI.I
 				.INB INC/MLI.E.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 0

BIN/CP.S.txt

@@ -8,6 +8,7 @@ AUTO 4,1
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
+				.INB INC/MLI.I
 				.INB INC/MLI.E.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 1

BIN/LS.S.txt

@@ -8,6 +8,7 @@ AUTO 4,1
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
+				.INB INC/MLI.I
 				.INB INC/MLI.E.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 0

BIN/MV.S.txt

@@ -8,7 +8,8 @@ AUTO 4,1
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
-				.INB INC/MLI.E.I				
+				.INB INC/MLI.I
+				.INB INC/MLI.E.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 1
 X.DELETE.SOURCE	.EQ 1				

BIN/RM.S.txt

@@ -8,6 +8,7 @@ AUTO 4,1
 *--------------------------------------
 				.INB INC/MACROS.I
 				.INB INC/A2OSX.I
+				.INB INC/MLI.I
 				.INB INC/MLI.E.I
 *--------------------------------------
 X.COPY.TO.DEST	.EQ 0

BIN/X.FILEENUM.S.txt

@@ -92,36 +92,17 @@ InitSrcDirYA	>SYSCALL RealPath
 
 				ldy #1
 				lda (ZPPtr1),y
-*				beq .5					we have '/'
-				bne .55
-				jmp .5
-				
-.55				>PUSHEA.G STAT
+				beq .5					we have '/'
+
+				>PUSHEA.G STAT
 				>LDYA ZPPtr1
 				>SYSCALL Stat
 				bcs .1					File/DIR does not exists, go extract pattern
 				
 				>LDA.G STAT+S.STAT.P.TYPE
-				cmp #$0f
+				cmp #S.FI.T.DIR
 				bne .4					TYPE not a DIR, extract....
 
-				ldy #0
-				
-.56				iny
-				lda (ZPPtr1),y
-				bne .56
-				
-				dey
-				lda #'/'
-				cmp (ZPPtr1),y
-				beq .5
-				
-				iny
-				sta (ZPPtr1),y
-				iny
-				lda #0
-				sta (ZPPtr1),y
-				
 				bra .5					TYPE=DIR, do not extract pattern 				
 				
 .1				ldy #0					TYPE is not DIR, check if wc
@@ -194,7 +175,18 @@ InitSrcDirYA	>SYSCALL RealPath
 				sta (ZPPtr2),y
 				bne .6
 					
-				>LDYA ZPPtr2
+				dey
+				lda #'/'
+				cmp (ZPPtr2),y
+				beq .7
+
+				iny
+				sta (ZPPtr2),y
+				iny
+				lda #0
+				sta (ZPPtr2),y
+				
+.7				>LDYA ZPPtr2
 				>SYSCALL OpenDir
 				
 				bcs .9
@@ -236,7 +228,7 @@ InitDstDirYA	>SYSCALL RealPath
 				bcs .1					File/DIR does not exists, go extract DstFileName
 				
 				>LDA.G STAT+S.STAT.P.TYPE
-				cmp #$0f
+				cmp #S.FI.T.DIR
 				beq .5					Dst is a directory...no destfilename
 				
 .1				ldy #0
@@ -324,10 +316,9 @@ GetNextEntry	jsr GetEntry
 				adc /S.STAT
 				sta ZPFileName+1		Make nDIRENTs[i] point to next DIRENT
 
-				lda (ZPFileName)		are we at end of this buffer ?
+				jsr GetFilenameLen		are we at end of this buffer ?
 				beq .1					yes, go read next one ...
 				
-				jsr GetFilenameLen
 				jsr SetFileStatPtr
 
 				jsr GetoDIRENT
@@ -516,7 +507,7 @@ LeaveSubDir		>LDA.G index
 				sta (pData),y
 				pla
 				>SYSCALL FreeMem
-				
+
 .1				jsr GethDIR
 				
 				pha
@@ -531,7 +522,7 @@ LeaveSubDir		>LDA.G index
 				ldy #hSrcBasePath
 				lda (pData),y
 				>SYSCALL FreeMem
-				
+
 				.DO X.COPY.TO.DEST=1
 				ldy #hDstBasePath
 				lda (pData),y

SYS/KERNEL.S.MEM.txt

@@ -263,9 +263,9 @@ K.FreeMem.FREED clc
 				>LDYAI K.FreeMem.ERRFREED
 				
 .1				>SYSCALL printf
-				
-				plx
 
+				plx
+				>DEBUG
 				sec
 				rts
 *--------------------------------------