[libc] fix issues with inchar/outchar and fget/fput family

Author: mateoconlechuga

src/libc/fputc.c

@@ -5,15 +5,14 @@ int __attribute__((weak)) fputc(int c, FILE *stream)
 {
     int ret;
 
-    if (stream == NULL ||
-        stream == stdin)
+    if (stream == NULL || stream == stdin)
     {
         ret = EOF;
     }
-    else if (stream == stdout ||
-             stream == stderr)
+    else if (stream == stdout || stream == stderr)
     {
-        ret = putchar(c);
+        putchar(c);
+        ret = c;
     }
     else
     {
@@ -30,5 +29,5 @@ int __attribute__((weak)) fputc(int c, FILE *stream)
         stream->err = 1;
     }
 
-    return ti_PutC((char)c, stream->slot);
+    return ret;
 }

src/libc/fputs.c

@@ -15,10 +15,5 @@ int __attribute__((weak)) fputs(const char *__restrict str, FILE *__restrict str
         i++;
     }
 
-    if (fputc('\n', stream) == EOF)
-    {
-        return EOF;
-    }
-
     return 1;
 }

src/libc/getchar.src

@@ -2,16 +2,5 @@
 
 	section	.text
 	public	_getchar
-_getchar:
-	call	_inchar
-	ld	l,a
-	rlc	l
-	sbc	hl,hl
-	ld	l,a
-	push	hl
-	call	_outchar
-	pop	hl
-	ret
-
+_getchar := _inchar
 	extern	_inchar
-	extern	_outchar

src/crt/inchar.src renamed to src/libc/inchar.src

@@ -4,24 +4,33 @@
 	weak	_inchar
 _inchar:
     	ld	iy,$d00080	; ti.flags
-.getchar:
+.l:
 	call	$2014C		; ti.GetCSC
 	or	a,a
-	jr	z,.getchar
+	jr	z,.l
 	sbc	hl,hl
 	ld	l,a
-	ld	de,.lut_char
+	ld	de,.lut
     	add	hl,de
 	ld	a,(hl)
 	or	a,a
-	jr	z,_inchar
+	jr	z,.l
+	sbc	hl,hl
+	ld	l,a
+	push	hl
+	push	hl
+	call	_outchar
+	pop	hl
+	pop	hl
 	ret
 
-.lut_char:
+.lut:
 	db	0,0,0,0,0,0,0,0,0,10		;
 	db	0,'WRMH',0,0   			; + - × ÷ ^ undef
 	db	0,'Z'+ 1,'VQLG',0,0 		; (-) 3 6 9 ) TAN VARS undef
 	db	0,'ZUPKFC',0   			; . 2 5 8 ( COS PRGM STAT
 	db	' YTOJEBX',0			; 0 1 4 7 , SIN APPS XT?n undef
 	db	'XSNIDA'			; STO LN LOG x2 x-1 MATH
 	db	0,0,0,0,0,0,0,0,0,0		;
+
+	extern	_outchar

src/libc/include/stdio.h

@@ -36,7 +36,7 @@ typedef struct
 __BEGIN_DECLS
 
 /* weak user-defined functions */
-char inchar(void);
+int inchar(void);
 
 void outchar(char character);
 

src/libc/outchar.src

@@ -7,9 +7,6 @@ _outchar:
 	ex	(sp),hl
 	push	de
 	ld	iy,$d00080	; ti.flags
-	ld	a,l
-	cp	a,32
-	jp	nc,$207B8	; ti.PutC
 	cp	a,10
 	jp	z,$0207F0	; ti.NewLine
-	ret
+	jp	$207B8	; ti.PutC

src/libc/putchar.src

@@ -7,8 +7,10 @@ _putchar:
 	ex	(sp),hl
 	push	de
 	push	hl
+	push	hl
 	call	_outchar
 	pop	hl
+	push	hl
 	ret
 
 	extern	_outchar