Import Dev86src-0.16.3.tar.gzv0.16.3

3 files changed, 25 insertions, 25 deletions

diff --git a/libc/conio/Makefile b/libc/conio/Makefile
index 662b0ec..21b0a4d 100644
--- a/libc/conio/Makefile
+++ b/libc/conio/Makefile
@@ -3,13 +3,10 @@
 # under the GNU Library General Public License.
 
 ASRC=conio.c
-AOBJ=getch.o getche.o kbhit.o putch.o
+AOBJ=getch.o getche.o kbhit.o putch.o cputs.o gotoxy.o
 
-BSRC=conio.c
-BOBJ=cputs.o
-
-BIOSOBJ=$(BOBJ) cprintf.o
-DOSOBJ=$(AOBJ) $(BOBJ) cprintf.o
+BIOSOBJ=cprintf.o
+DOSOBJ=$(AOBJ) cprintf.o
 
 CFLAGS=$(ARCH) $(CCFLAGS) $(DEFS)
 
diff --git a/libc/conio/conio.c b/libc/conio/conio.c
index ee311a5..dfe30ee 100644
--- a/libc/conio/conio.c
+++ b/libc/conio/conio.c
@@ -9,8 +9,7 @@
  * I'm not sure if these should be BIOS or dos calls, so I'll assume they're
  * BIOS calls but I may have to do something about Ctrl-C.
  *
- * These functions are also compiled for __STANDALONE__ so if ^C or DOS
- * versions are made this will have to be addressed.
+ * Not implemented: cgets() cscanf() getpass() ungetch()
  */
 
 #ifdef L_getch
@@ -73,22 +72,26 @@ char * str;
 }
 #endif
 
-#if 0
-
-cgets()
-{
-}
-
-cscanf()
-{
-}
-
-getpass()
-{
-}
-
-gotoxy()
+#ifdef L_gotoxy
+static gotoxy(x,y)
 {
+#asm
+#if __FIRST_ARG_IN_AX__
+  mov	bx,sp
+  mov	dl,al
+  mov	ax,[bx+2]
+  mov	dh,al
+#else
+  mov	bx,sp
+  mov	ax,[bx+4]
+  mov	dh,al
+  mov	ax,[bx+2]
+  mov	dl,al
+#endif
+  mov	ah,#$02
+  mov	bx,#7
+  int	$10
+#endasm
 }
-
 #endif
+
diff --git a/libc/conio/cprintf.c b/libc/conio/cprintf.c
index 5194376..5368c89 100644
--- a/libc/conio/cprintf.c
+++ b/libc/conio/cprintf.c
@@ -11,7 +11,7 @@ static unsigned char * __numout(long i, int base);
 int cprintf(char * fmt, ...)
 {
    register int c;
-   int count = 0;
+   register int count = 0;
    int type, base;
    long val;
    char * cp;