Kernel 0.92+

BIN/SH.S.CMD.txt

@@ -343,7 +343,7 @@ CMD.ECHO		stz ZPPtr1				echo -N
 
 				lda (ZPArgVBufPtr)
 				beq .7
-				
+
 .1				jsr CMD.IsSwitch
 				bcs .2
 				
@@ -646,7 +646,13 @@ CMD.IsSwitch	lda (ZPArgVBufPtr)
 				ldy #1
 				lda (ZPArgVBufPtr),y
 				beq .9
-				tax
+				
+				cmp #'0'				is -0 ... -9 ?
+				bcc .9
+				cmp #'9'+1
+				bcc .9
+				
+.1				tax
 				iny
 				lda (ZPArgVBufPtr),y
 				bne .9
@@ -657,9 +663,11 @@ CMD.IsSwitch	lda (ZPArgVBufPtr)
 				cmp #'z'+1
 				bcs .8
 				eor #$20
+				
+.8				jsr CORE.ArgV.NextChar
 				jsr CORE.ArgV.NextChar
-				jsr CORE.ArgV.NextChar
-.8				clc
+
+				clc
 				rts
 				
 .9				sec				

BIN/SH.S.CORE.txt

@@ -347,11 +347,17 @@ CORE.ArgV.Add	>LDYA ZPArgVBufPtr
 
 .7				iny
 				lda (ZPPtr1),y
+				beq .8
 				jsr CORE.ArgV.PutChar
-				lda (ZPPtr1),y
-				bne .7
+				bra .7
 				
-				pla
+.8				tya
+				beq .81
+				
+				lda #0
+				jsr CORE.ArgV.PutChar
+				
+.81				pla
 				>SYSCALL freemem
 .9				rts
 *--------------------------------------

BIN/SH.S.EXP.txt

@@ -187,6 +187,7 @@ EXP.OP.UNARY.N	lda (ZPArgVBufPtr)		[ -N ] ?
 				bra EXP.OP.UNARY.DEF.8	arg is not empty TRUE
 				 
 EXP.OP.UNARY.Z	lda (ZPArgVBufPtr)		[ -Z ] ?
+
 				cmp #']'
 				beq EXP.OP.UNARY.DEF.8	TRUE
 				
@@ -200,9 +201,10 @@ EXP.TEST.BINARY	>LDA.G CORE.Operator
 				cmp #2					!=
 				bne EXP.TEST.BINARY.NUM
 				lda #$80
-				>STA.G CORE.Operator
+
+.1				>STA.G CORE.Operator
 				
-.1				>LDYA ZPArgVBufPrev
+				>LDYA ZPArgVBufPrev
 				>STYA ZPPtr1
 				
 				jsr CORE.ArgV.Next

BIN/SH.S.IO.txt

@@ -138,12 +138,24 @@ IO.PrintBatchErrMsg
 				>LDYA ZPInputBuf
 				>STYA ZPPtr1
 				
-				stz ZPPtr2				Line Count
-				stz ZPPtr2+1
+				ldy #S.PS.RC
+				lda (pPs),y
+				cmp #E.CSYN
+				beq .10
+				
+				>LDYA ZPInputCmdPtr
+				bra .11
+				
+.10				>LDYA ZPInputBufPtr
 
-.1				inc ZPPtr2
+.11				>STYA ZPPtr2
+				
+				stz TmpWord				Line Count
+				stz TmpWord+1
+
+.1				inc TmpWord
 				bne .2
-				inc ZPPtr2+1
+				inc TmpWord+1
 
 .2				ldy #$ff
 
@@ -162,8 +174,8 @@ IO.PrintBatchErrMsg
 				adc #0
 				pha
 
-				cpx ZPInputBufPtr
-				sbc ZPInputBufPtr+1
+				cpx ZPPtr2
+				sbc ZPPtr2+1
 				pla
 				bcs .41
 				
@@ -214,7 +226,7 @@ IO.PrintBatchErrMsg
 				ply
 				bra .7
 				
-.8				>PUSHW ZPPtr2
+.8				>PUSHW TmpWord
 				
 				>PUSHBI 2
 				>PUSHW L.MSG.BATCHERR

BIN/SH.S.txt

@@ -67,6 +67,7 @@ ZPArgVBufPtr	.BS 2
 ZPVarNamePtr	.BS 2
 ZPPtr1			.BS 2
 ZPPtr2			.BS 2
+TmpWord			.BS 2
 TmpByte			.BS 1
 ZS.END			.ED				
 *--------------------------------------

INC/A2osX.I.txt

@@ -466,7 +466,7 @@ S.FD.SSOCK.OPEN		.EQ 3
 S.FD.SSOCK.CLOSE	.EQ 4
 S.FD.SSOCK.READ		.EQ 5
 S.FD.SSOCK.WRITE	.EQ 6
-S.FD.SSOCK.STATUS	.EQ 7
+S.FD.SSOCK.EOF		.EQ 7
 *
 S.FD.SSOCK		.EQ 8
 *--------------------------------------

INC/LIBTCPIP.I.txt

@@ -58,7 +58,8 @@ LIBTCPIP.SendTo		.EQ 54
 LIBTCPIP.getsockopt	.EQ 56
 LIBTCPIP.setsockopt	.EQ 58
 
-LIBTCPIP.GetTable	.EQ 60
+LIBTCPIP.EOF		.EQ 60
+LIBTCPIP.GetTable	.EQ 62
 *--------------------------------------
 ERR.SKT.OOS			.EQ $BF
 ERR.SKT.BUSY		.EQ $BE

LIB/LIBTCPIP.S.SKT.txt

@@ -669,6 +669,16 @@ SKT.setsockopt	>SYSCALL GetMemPtr
 				sta (ZPPtrSKT),y
 *				clc
 				rts
+*--------------------------------------				
+SKT.EOF			>SYSCALL GetMemPtr
+				>STYA ZPPtrSKT
+				
+				ldy #S.SOCKET.TCP.INUSED
+				lda (ZPPtrSKT),y
+				iny
+				ora (ZPPtrSKT),y
+				clc
+				rts
 */--------------------------------------
 * # GetTable
 * Get socket table

LIB/LIBTCPIP.S.txt

@@ -114,6 +114,7 @@ CS.START		cld
 				.DA SKT.getsockopt
 				.DA SKT.setsockopt
 
+				.DA SKT.EOF
 				.DA SKT.GetTable
 *--------------------------------------
 L.IPCFG			.DA IPCFG
@@ -385,7 +386,7 @@ FD.SSOCK		.DA #S.FD.T.SSOCK
 				.DA #0					S.FD.SSOCK.CLOSE
 				.DA #LIBTCPIP.Read
 				.DA #LIBTCPIP.Write
-				.DA #0					S.FD.DSOCK.STATUS
+				.DA #LIBTCPIP.EOF
 *--------------------------------------
 				.DA #AF.INET			S.SOCKET.AF
 				.DA #S.SOCKET.T.STREAM

SYS/KERNEL.S.IO.txt

@@ -404,6 +404,9 @@ IO.WRITE.CDEV	ldx #IOCTL.WRITE
 
 .9				>RET 4
 *--------------------------------------
+IO.EOF.SSOCK	ldy #S.FD.SSOCK.EOF
+				.HS 2C					BIT ABS
+*--------------------------------------
 IO.WRITE.SSOCK	ldy #S.FD.SSOCK.WRITE
 				.HS 2C					BIT ABS
 *--------------------------------------
@@ -699,12 +702,7 @@ IO.EOF.CDEV		>LDYAI K.IOBuf
 				ora K.IOBuf+1
 .9				rts			
 *--------------------------------------
-IO.EOF.SSOCK
-				lda #MLI.E.IO
-				sec
-				rts
-*--------------------------------------
-IO.EOF.PIPE		
+IO.EOF.PIPE	
 				lda #MLI.E.IO
 				sec
 				rts