Import Dev86src-0.14.8.tar.gzv0.14.8

23 files changed, 492 insertions, 148 deletions

diff --git a/libc/Makefile b/libc/Makefile
index 2e1ffd3..0b18d17 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -11,7 +11,7 @@ endif
 
 VERMAJOR=0
 VERMINOR=14
-VERPATCH=7
+VERPATCH=8
 VER=$(VERMAJOR).$(VERMINOR).$(VERPATCH)
 
 CC=bcc
diff --git a/libc/bcc/__ldivmod.c b/libc/bcc/__ldivmod.c
index 359c692..dbde4b8 100644
--- a/libc/bcc/__ldivmod.c
+++ b/libc/bcc/__ldivmod.c
@@ -21,7 +21,7 @@
 
 
 ! let dividend = a, divisor = b, quotient = q, remainder = r
-!	a = b * q + r  mod 2^32
+!	a = b * q + r  mod 2**32
 ! where:
 
 ! if b = 0, q = 0 and r = a
diff --git a/libc/getent/utent.c b/libc/getent/utent.c
index 7f9e19a..f4c2ebc 100644
--- a/libc/getent/utent.c
+++ b/libc/getent/utent.c
@@ -19,10 +19,13 @@ static const char * ut_name=_PATH_UTMP;
 static int ut_fd=-1;
 
 struct utmp *
-__getutent(int utmp_fd)
+getutent(void)
 {
   static struct utmp utmp;
-  if (read(utmp_fd, (char *) &utmp, sizeof(struct utmp))!=sizeof(struct utmp))
+  if (ut_fd==-1) setutent();
+  if (ut_fd==-1) return NULL;
+
+  if (read(ut_fd, (char *) &utmp, sizeof(struct utmp))!=sizeof(struct utmp))
     return NULL;
   return &utmp;
 }
@@ -30,13 +33,20 @@ __getutent(int utmp_fd)
 void
 setutent(void)
 {
+  int xerrno = errno;
   if (ut_fd!=-1)
-    close(ut_fd);
-  if ((ut_fd=open(ut_name, O_RDONLY))<0)
+    close(ut_fd); /* ... Should this be an Lseek ? */
+
+  if ((ut_fd=open(ut_name, O_RDWR))<0)
     {
-      perror("setutent: Can't open utmp file");
-      ut_fd=-1;
+      if (errno!=EACCES || (ut_fd=open(ut_name, O_RDONLY))<0)
+        {
+	   /* No, this is a library function, it should not do this! */
+           /* perror("setutent: Can't open utmp file"); */
+           ut_fd=-1;
+        }
     }
+  if (ut_fd!= -1) errno=xerrno;
 }
 
 void
@@ -48,26 +58,11 @@ endutent(void)
 }
 
 struct utmp *
-getutent(void)
-{
-  if (ut_fd==-1)
-    setutent();
-  if (ut_fd==-1)
-    return NULL;
-  return __getutent(ut_fd);
-}
-
-struct utmp *
-getutid(struct utmp * utmp_entry)
+getutid(const struct utmp * utmp_entry)
 {
   struct utmp * utmp;
   
-  if (ut_fd==-1)
-    setutent();
-  if (ut_fd==-1)
-    return NULL;
-
-  while ((utmp=__getutent(ut_fd))!=NULL)
+  while ((utmp=getutent())!=NULL)
     {
       if ((utmp_entry->ut_type==RUN_LVL   ||
 	   utmp_entry->ut_type==BOOT_TIME ||
@@ -79,7 +74,7 @@ getutid(struct utmp * utmp_entry)
 	   utmp_entry->ut_type==DEAD_PROCESS ||
 	   utmp_entry->ut_type==LOGIN_PROCESS ||
 	   utmp_entry->ut_type==USER_PROCESS) &&
-	  !strcmp(utmp->ut_id, utmp_entry->ut_id))
+	  !strncmp(utmp->ut_id, utmp_entry->ut_id,sizeof(utmp->ut_id)))
 	return utmp;
     }
 
@@ -87,21 +82,17 @@ getutid(struct utmp * utmp_entry)
 }
 
 struct utmp *
-getutline(struct utmp * utmp_entry)
+getutline(const struct utmp * utmp_entry)
 {
   struct utmp * utmp;
 
-  if (ut_fd==-1)
-    setutent();
-  if (ut_fd==-1)
-    return NULL;
-
 #if 0 /* This is driving me nuts.  It's not an implementation problem -
 	 it's a matter of how things _SHOULD_ behave.  Groan. */
-  lseek(ut_fd, SEEK_CUR, -sizeof(struct utmp));
+  if (ut_fd!=-1)
+     lseek(ut_fd, (off_t) -sizeof(struct utmp), SEEK_CUR);
 #endif
 
-  while ((utmp=__getutent(ut_fd))!=NULL)
+  while ((utmp=getutent())!=NULL)
     {
       if ((utmp->ut_type==USER_PROCESS  ||
 	   utmp->ut_type==LOGIN_PROCESS) &&
@@ -113,40 +104,47 @@ getutline(struct utmp * utmp_entry)
 }
 
 struct utmp *
-pututline(struct utmp * utmp_entry)
+pututline(const struct utmp * utmp_entry)
 {
   struct utmp * ut;
+  int xerrno=errno;
 
+#if 0
   /* Ignore the return value.  That way, if they've already positioned
      the file pointer where they want it, everything will work out. */
-  (void) lseek(ut_fd, (off_t) -sizeof(utmp_entry), SEEK_CUR);
+  if (ut_fd!=-1)
+  (void) lseek(ut_fd, (off_t) -sizeof(struct utmp), SEEK_CUR);
+#endif
 
   if ((ut=getutid(utmp_entry))!=NULL)
-    {
-      lseek(ut_fd, (off_t) -sizeof(utmp_entry), SEEK_CUR);
-      if (write(ut_fd, (char *) utmp_entry, sizeof(utmp_entry))
-	  != sizeof(utmp_entry))
-	return NULL;
-    }
+      lseek(ut_fd, (off_t) -sizeof(struct utmp), SEEK_CUR);
+  else if( ut_fd==-1 )
+      return NULL;
   else
-    {
       lseek(ut_fd, (off_t) 0, SEEK_END);
-      if (write(ut_fd, (char *) utmp_entry, sizeof(utmp_entry))
-	  != sizeof(utmp_entry))
-	return NULL;
-    }
 
+  /*
+   * At this point I could make sure the offset we're at is an exact multiple
+   * of the sizeof struct utmp. Should I? Up or down?  --RdB
+   */
+
+  if (write(ut_fd, (char *) utmp_entry, sizeof(struct utmp))
+      != sizeof(struct utmp))
+    return NULL;
+
+  /* I think this final lseek gets the result Nat was after ... RdB */
+  lseek(ut_fd, (off_t) -sizeof(struct utmp), SEEK_CUR);
+
+  /* Ignoring untrapped errors */
+  errno=xerrno;
   return utmp_entry;
 }
 
 void
 utmpname(const char * new_ut_name)
 {
+  endutent();
+
   if (new_ut_name!=NULL)
     ut_name=new_ut_name;
-
-  if (ut_fd!=-1)
-    close(ut_fd);
 }
-
-
diff --git a/libc/include/bios.h b/libc/include/bios.h
index 4cfcd6a..20aa5ca 100644
--- a/libc/include/bios.h
+++ b/libc/include/bios.h
@@ -5,7 +5,7 @@
 
 union REGS
 {
-   struct { unsigned int ax, bx, cx, dx, si, di, cflag; } x;
+   struct { unsigned int ax, bx, cx, dx, si, di, cflag, flags; } x;
    struct { unsigned char al, ah, bl, bh, cl, ch, dl, dh; } h;
 };
 
diff --git a/libc/include/msdos/fcntl.h b/libc/include/msdos/fcntl.h
index 8cf076c..f92ff2a 100644
--- a/libc/include/msdos/fcntl.h
+++ b/libc/include/msdos/fcntl.h
@@ -1,16 +1,27 @@
 #ifndef __MSDOS_FCNTL_H
 #define __MSDOS_FCNTL_H
 
-/* Definitions taken from the i386 Linux kernel. */
+/* Definitions taken from Ralf Brown interrupt list and Linux kernel */
 
-#define O_ACCMODE	  0003
-#define O_RDONLY	    00
-#define O_WRONLY	    01
-#define O_RDWR		    02
-#define O_CREAT		  0100	/* not fcntl */
-#define O_EXCL		  0200	/* not fcntl */
-#define O_TRUNC		 01000	/* not fcntl */
-#define O_APPEND	 02000
+#define O_ACCMODE	0x03
+#define O_RDONLY	0x00
+#define O_WRONLY	0x01
+#define O_RDWR		0x02
+
+#define O_DENYMODE	0x70
+#define O_DENYALL	0x10
+#define O_DENYWRITE	0x20
+#define O_DENYREAD	0x30
+#define O_DENYNONE	0x40
+#define O_SETFD		0x80	/* Close on exec flag for open */
+
+#define O_CREAT		0x100	/* Moved on DOS to avoid DENY's */
+#define O_TRUNC		0x200
+#define O_APPEND	0x400
+#define O_EXCL		0x800
+
+#define O_BINARY	0x0000
+#define O_TEXT	 	0x8000	/* This right ? Who cares! */
 
 #define F_DUPFD		0	/* dup */
 #define F_GETFD		1	/* get f_flags */
diff --git a/libc/include/stddef.h b/libc/include/stddef.h
index f26997a..3b446ac 100644
--- a/libc/include/stddef.h
+++ b/libc/include/stddef.h
@@ -10,7 +10,7 @@
 #include <sys/types.h>
 
 #ifndef NULL
-#define NULL 0
+#define NULL ((void*)0)
 #endif
 
 #endif /* __STDDEF_H */
diff --git a/libc/include/stdio.h b/libc/include/stdio.h
index 98ca38a..fd10923 100644
--- a/libc/include/stdio.h
+++ b/libc/include/stdio.h
@@ -56,7 +56,7 @@ struct __stdio_file {
 
 #define EOF	(-1)
 #ifndef NULL
-#define NULL	(0)
+#define NULL	((void*)0)
 #endif
 
 typedef struct __stdio_file FILE;
diff --git a/libc/include/utmp.h b/libc/include/utmp.h
index 9fe0e87..baf6f9e 100644
--- a/libc/include/utmp.h
+++ b/libc/include/utmp.h
@@ -39,9 +39,9 @@ struct utmp
 extern void             setutent __P ((void));
 extern void             utmpname __P ((__const char *));
 extern struct utmp *    getutent __P ((void));
-extern struct utmp *    getutid __P ((struct utmp *));
-extern struct utmp *    getutline __P ((struct utmp *));
-extern struct utmp *    pututline __P ((struct utmp *));
+extern struct utmp *    getutid __P ((__const struct utmp *));
+extern struct utmp *    getutline __P ((__const struct utmp *));
+extern struct utmp *    pututline __P ((__const struct utmp *));
 extern void             endutent __P ((void));
 
 #ifdef __LIBC__
diff --git a/libc/msdos/Makefile b/libc/msdos/Makefile
index 06d999a..0a53679 100644
--- a/libc/msdos/Makefile
+++ b/libc/msdos/Makefile
@@ -11,11 +11,11 @@ AOBJ= \
 
 BSRC=i86.c
 BOBJ= __seg_regs.o __peek_es.o __poke_es.o __deek_es.o __doke_es.o	\
-      __strnget_es.o __strchr_es.o __strlen_es.o
+      __strnget_es.o __strchr_es.o __strlen_es.o int86.o int86x.o segread.o
 
 ifeq ($(LIB_CPU),i86)
 ifeq ($(LIB_OS),DOS)
-OBJ=$(AOBJ) $(BOBJ) time.o
+OBJ=$(AOBJ) $(BOBJ) time.o sound.o
 else
 OBJ=$(BOBJ)
 endif
diff --git a/libc/msdos/TODO b/libc/msdos/TODO
index f2664a2..c9f57e1 100644
--- a/libc/msdos/TODO
+++ b/libc/msdos/TODO
@@ -1,3 +1,11 @@
 #define remove(x) unlink(x)
 
+opendir
+
+closedir
+
+readdir 
+
+rewinddir
+
 See also the other files, many parts are incomplete.
diff --git a/libc/msdos/conio.c b/libc/msdos/conio.c
index 1abfa40..f6f9105 100644
--- a/libc/msdos/conio.c
+++ b/libc/msdos/conio.c
@@ -1,4 +1,12 @@
-/* Is this BIOS keyboard io ? */
+/* Copyright (C) 1999 Robert de Bath <rdebath@cix.compulink.co.uk>
+ * This file is part of the Linux-8086 C library and is distributed
+ * under the GNU Library General Public License.
+ */
+
+/* 
+ * 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.
+ */
 
 getch()
 {
@@ -50,6 +58,8 @@ char * str;
    while(*str) putch(*str++);
 }
 
+#if 0
+
 cgets()
 {
 }
@@ -70,4 +80,4 @@ gotoxy()
 {
 }
 
-
+#endif
diff --git a/libc/msdos/dirent.c b/libc/msdos/dirent.c
deleted file mode 100644
index 00d774e..0000000
--- a/libc/msdos/dirent.c
+++ /dev/null
@@ -1,8 +0,0 @@
-
-opendir
-
-closedir
-
-readdir 
-
-rewinddir
diff --git a/libc/msdos/dosound.c b/libc/msdos/dosound.c
deleted file mode 100644
index 80f49d6..0000000
--- a/libc/msdos/dosound.c
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-nosound()
-{
-}
-
-sound(freq)
-int freq
-{
-}
diff --git a/libc/msdos/i86.c b/libc/msdos/i86.c
index 6c613b2..3cab105 100644
--- a/libc/msdos/i86.c
+++ b/libc/msdos/i86.c
@@ -218,4 +218,181 @@ char * str;
 }
 #endif
 
+#ifdef  L_int86
+int
+int86(intr, in_regs, out_regs)
+int intr;
+union REGS* in_regs;
+union REGS* out_regs;
+{
+#asm
+  push	bp
+  mov	bp,sp
+  push	ds			! save ds
+  				! es too ?
+  push	bp			! same for new bp
+
+  pushf				! iret flags
+  mov	ax,[bp-6]		! flags for simulated int
+  push	cs			! iret address segment
+  mov	bx,#ret_addr		! iret address offset
+  push	bx
+  and	ah,#$0C			! simulate interrupt flags
+  push	ax			! flags are pushed first
+
+  xor	bx,bx
+  mov	es,bx			! interrupt vectors in seg 0
+  mov	bl,[bp+4]
+  shl	bx,#1
+  shl	bx,#1			! intr*4 => interrupt vector address
+  seg	es
+  push	[bx+2]			! fetch interrupt segment
+  seg	es
+  push	[bx]			! fetch interrupt offset
+  mov	bx,[bp+6]		! input union REGS*
+
+  mov	ax,[bx]
+  mov	cx,[bx+4]
+  mov	dx,[bx+6]
+  mov	si,[bx+8]
+  mov	di,[bx+10]
+  mov	bx,[bx+2]
+  ! Ignore cflag/flags ?
+
+  iret				! simulate interrupt.
+  				! But won't be nice for protected mode ...
+ret_addr:
+  ! Int $25/6 would need resetting sp:ss too ... should I ?
+
+  pop	bp			! unzapped versions
+  pop	ds			! paranoia
+
+  pushf				! save interrupt flags
+  push	bx			! save pointer register
+  mov	bx,[bp+8]		! output union REGS*
+
+  mov	[bx],ax
+  pop	[bx+2]
+  mov	[bx+4],cx
+  mov	[bx+6],dx
+  mov	[bx+8],si
+  mov	[bx+10],di
+  mov	word [bx+12],#0		! cflag
+  jnc	no_carry
+  mov	byte [bx+12],#1
+no_carry:
+  pop	[bx+14]			! flags
+
+  pop	bp
+#endasm
+}
+
+#endif
+
+#ifdef  L_int86x
+int
+int86x(intr, in_regs, out_regs, segr)
+int intr;
+union REGS* in_regs;
+union REGS* out_regs;
+struct SREGS * segr;
+{
+#asm
+  push	bp
+  mov	bp,sp
+  push	ds			! save ds
+  				! es too ?
+  push	bp			! same for new bp
+
+  pushf				! iret flags
+  mov	ax,[bp-6]		! flags for simulated int
+  push	cs			! iret address segment
+  mov	bx,#ret_addr		! iret address offset
+  push	bx
+  and	ah,#$0C			! simulate interrupt flags
+  push	ax			! flags are pushed first
+
+  xor	bx,bx
+  mov	es,bx			! interrupt vectors in seg 0
+  mov	bl,[bp+4]
+  shl	bx,1
+  shl	bx,1			! intr*4 => interrupt vector address
+  seg	es
+  push	word [bx+2]		! fetch interrupt segment
+  seg	es
+  push	word [bx]		! fetch interrupt offset
+
+  mov	bx,[bp+10]		! struct SREGS*
+  mov	es,[bx]
+  push	[bx+6]			! ds
+ 
+  mov	bx,[bp+6]		! input union REGS*
+
+  mov	ax,[bx]
+  mov	cx,[bx+4]
+  mov	dx,[bx+6]
+  mov	si,[bx+8]
+  mov	di,[bx+10]
+  mov	bx,[bx+2]
+  ! Ignore cflag/flags ?
+
+  pop	ds
+
+  iret				! simulate interrupt
+  				! But won't be nice for protected mode ...
+
+ret_addr:
+  ! Int $25/6 would need resetting sp:ss too ... should I ?
+
+  pop	bp			! in case it was zapped
+
+  pushf				! save interrupt flags
+
+  push	cx			! save work register
+  mov	cx,ds
+  push	bx			! save pointer register
+
+  mov	ds,word [bp-2]		! restore original ds
+  mov	bx,[bp+10]		! struct SREGS*
+  mov	[bx],es
+  mov	[bx+6],cx
+ 
+  mov	bx,[bp+8]		! output union REGS*
+  mov	[bx],ax
+  pop	[bx+2]			! bx
+  pop	[bx+4]			! cx
+  mov	[bx+6],dx
+  mov	[bx+8],si
+  mov	[bx+10],di
+  mov	word [bx+12],#0		! cflag
+  jnc	no_carry
+  mov	byte [bx+12],#1
+no_carry:
+  pop	[bx+14]			! flags
+
+  pop	ds
+  pop	bp
+#endasm
+}
+#endif
+
+#ifdef L_segread
+segread(segp)
+struct SREGS * segp;
+{
+#asm
+#if __FIRST_ARG_IN_AX__
+  mov	bx,ax
+#else
+  mov	bx,sp
+  mov	bx,[bx+2]
+#endif
+  mov	[bx],es
+  mov	[bx+2],cs
+  mov	[bx+4],ss
+  mov	[bx+6],ds
+#endasm
+}
+#endif
+
 #endif /* __AS386_16__ */
diff --git a/libc/msdos/intr.c b/libc/msdos/intr.c
new file mode 100644
index 0000000..22de042
--- /dev/null
+++ b/libc/msdos/intr.c
@@ -0,0 +1,82 @@
+
+struct REGPACK
+{
+   unsigned r_ax, r_bx, r_cx, r_dx;
+   unsigned r_bp, r_si, r_di, r_ds, r_es, r_flags;
+};
+
+/* DANGER DANGER -- Self modifying code! */
+
+#asm
+.text
+save_sp:
+  dw	0
+#endasm
+
+intr(intr, regs)
+int intr;
+struct REGPACK * regs;
+{
+#asm
+  mov	bx,sp
+  push	bp
+  push	si
+  push	di
+  push	es
+  push	ds
+
+  mov	ax,[bx+2]
+  seg	cs
+  mov	[intr_inst+1],al
+  seg	cs
+  mov	[save_sp],sp
+
+  mov	bx,[bx+4]
+
+  mov	ah,[bx+18]	! Flags low byte
+  sahf 
+
+  mov	ax,[bx]
+  push	[bx+2]
+  mov	cx,[bx+4]
+  mov	dx,[bx+6]
+  mov	bp,[bx+8]
+  mov	si,[bx+10]
+  mov	di,[bx+12]
+  mov	es,[bx+16]
+  mov	ds,[bx+14]
+  pop	bx
+
+intr_inst:
+  int	$FF		! Must be a real int .. consider protected mode.
+
+  seg	cs		! Could be SS as DS==SS
+  mov	sp,[save_sp]
+  seg	cs
+  mov	[save_sp],ds
+  pop	ds
+  push	[save_sp]
+
+  push	bx
+  mov	bx,sp
+  mov	bx,[bx+12]
+
+  mov	[bx],ax
+  pop	[bx+2]
+  mov	[bx+4],cx
+  mov	[bx+6],dx 
+  mov	[bx+8],bp
+  mov	[bx+10],si
+  mov	[bx+12],di
+  pop	[bx+14]
+  mov	[bx+16],es
+  pushf
+  pop	[bx+18]
+
+  pop	es
+  pop	di
+  pop	si
+  pop	bp
+  
+#endasm
+}
diff --git a/libc/msdos/msdos.c b/libc/msdos/msdos.c
index 77100ae..ae10b39 100644
--- a/libc/msdos/msdos.c
+++ b/libc/msdos/msdos.c
@@ -180,7 +180,7 @@ int __argc;
 char ** __argv;
 {
    int length, i, argc=1, s=0;
-   char *ptr, *p;
+   unsigned char *ptr, *p;
    __set_es(__psp);			/* Pointer to the args */
    length = __peek_es(0x80); 		/* Length of cmd line */
    if( length > 0 )
@@ -190,25 +190,25 @@ char ** __argv;
       for(i=0; i<length; i++)		/* Copy it in. */
       {
 	ptr[i] = __peek_es(0x81+i);
-/* Replaced because freedos adds \r to args.
-	if( ptr[i] != ' ' && s == 0 ) { argc++; s=1; }
-	if( ptr[i] == ' ' && s == 1 ) s=0;
- */
-	if( (ptr[i]&0xE0) != 0 && s == 0 ) { argc++; s=1; }
-	if( (ptr[i]&0xE0) == 0 && s == 1 ) s=0;
+	if( ptr[i] >  ' ' && s == 0 ) { argc++; s=1; }
+	if( ptr[i] <= ' ' && s == 1 ) s=0;
       }
       ptr[length]=0;
 
       p= __argv[0];
       __argv = (char**) sbrk((argc+1)*sizeof(char*));
-      __argv[0] = p;		/* FIXME: The real command can be found */
+      __argv[0] = p;		/* TODO: The real command can be found */
       __argc=argc;
 
+      /*
+       * TODO: This needs to understand quoting and wildcards 
+       */
+
       argc=1; s=0;
       for(i=0; i<length; i++)
       {
-	if( ptr[i] != ' ' && s == 0 ) { __argv[argc++] = ptr+i; s=1; }
-	if( ptr[i] == ' ' && s == 1 ) { ptr[i] = '\0'; s=0; }
+	if( ptr[i] >  ' ' && s == 0 ) { __argv[argc++] = ptr+i; s=1; }
+	if( ptr[i] <= ' ' && s == 1 ) { ptr[i] = '\0'; s=0; }
       }
       __argv[argc] = 0;
    }
@@ -233,7 +233,10 @@ int __argc;
 char ** __argv;
 char ** __envp;
 {
-    /* FIXME !!! */
+    /* FIXME !!!
+     * 
+     * Note must write to __envp argument but not touch __argv or __argc
+     */
 }
 #endif
 
@@ -383,6 +386,19 @@ int cmode;
    int creat_mode = 0;
    int rv;
 
+static int xlate_mode[] = {
+#ifdef OPEN_LIKE_UNIX
+   O_RDONLY|O_DENYNONE,
+   O_WRONLY|O_DENYNONE,
+   O_RDWR|O_DENYNONE,
+#else
+   O_RDONLY|O_DENYNONE,
+   O_WRONLY|O_DENYWRITE,
+   O_RDWR|O_DENYALL,
+#endif
+   3
+};
+
    if( (cmode & 0222) == 0 ) creat_mode = 1;
 
    /* BzzzT. Assume these flags both mean the merge of them */
@@ -391,8 +407,13 @@ int cmode;
       rv = __dos_creat(nname, creat_mode);
 
    else
-   /* Warn, this assumes the standard vals for O_RDWR, O_RDONLY, O_WRONLY */
-      rv = __dos_open(nname, type&O_ACCMODE);
+   {
+      /* If we would open in compatibility mode make it a little more unixy */
+      if( type & O_DENYMODE )
+         rv = __dos_open(nname, type&(O_ACCMODE|O_DENYMODE|O_SETFD));
+      else
+         rv = __dos_open(nname, xlate_mode[type&O_ACCMODE]);
+   }
    return rv;
 }
 
diff --git a/libc/msdos/mslib.c b/libc/msdos/mslib.c
index c1dfb30..90e23ef 100644
--- a/libc/msdos/mslib.c
+++ b/libc/msdos/mslib.c
@@ -79,6 +79,44 @@ char * path;
 }
 #endif
 
+/*************************************************************************
+  TO TEST ...  
+*/
+
+#ifdef L_sleep
+sleep(secs)
+unsigned secs;
+{
+   int counter = 0;
+   int es = __get_es();
+
+   __set_es(0x40);
+
+   while(secs>0)
+   {
+      int c = __peek_es(0x6C);
+      while( c == __peek_es(0x6C) ) ;
+
+      counter += 549;
+      if( counter > 10000 )
+      {
+	 secs--;
+	 counter -= 10000;
+      }
+
+      /* Interrupt on ctrl-break */
+      if( __peek_es(0x71) & 0x80 ) break;
+   }
+   __set_es(es);
+
+   return secs;
+}
+#endif
+
+/*************************************************************************
+  TODO ...  
+*/
+
 #ifdef L_dos_access
 access(filename, amode)
 char * filename;
@@ -89,7 +127,8 @@ int amode;
 #endif
 
 #ifdef L__dos_allocmem
-_dos_allocmem(size
+_dos_allocmem(size ...)
+{
 
 }
 #endif
@@ -263,14 +302,6 @@ getpid()
 }
 #endif
 
-#ifdef  L_int86
- XXX;
-#endif
-
-#ifdef  L_int86x
- XXX;
-#endif
-
 #ifdef L_rename
 rename(oldname, newpath)
 char *oldpath, *newpath;
@@ -279,14 +310,6 @@ char *oldpath, *newpath;
 }
 #endif
 
-#ifdef L_segread
-segread(segp)
-struct SREGS * segp;
-{
-   XXX;
-}
-#endif
-
 #ifdef L_setmode
 setmode(fd, amode)
 int fd, amode;
@@ -295,13 +318,6 @@ int fd, amode;
 }
 #endif
 
-#ifdef L_sleep
-sleep(secs)
-unsigned secs;
-{
-   XXX;
-}
-#endif
 
 #ifdef L_system
 system(cmd)
@@ -316,6 +332,9 @@ umask(mode)
 int mode;
 {
    XXX;
+   /*
+    * save umask value for open() use it for read-only bit.
+    */
 }
 #endif
 
diff --git a/libc/msdos/new86.c b/libc/msdos/new86.c
index cc139bb..1c1e218 100644
--- a/libc/msdos/new86.c
+++ b/libc/msdos/new86.c
@@ -31,11 +31,11 @@ int portno;
 {
 }
 
-outp(
+outp(...)
 {
 }
 
-outpw(
+outpw(...)
 {
 }
 
@@ -58,12 +58,3 @@ pokeb(segment, offset, value)
 unsigned segment, offset, value;
 {
 }
-
-
-
-
-
-
-
-
-
diff --git a/libc/msdos/sound.c b/libc/msdos/sound.c
new file mode 100644
index 0000000..90c474c
--- /dev/null
+++ b/libc/msdos/sound.c
@@ -0,0 +1,27 @@
+
+#include <bios.h>
+
+static int port_val = -1;
+
+sound(freq)
+unsigned freq;	/* freq is in hertz */
+{
+   if(port_val == -1 )
+      port_val = inp(0x61);
+
+   freq = 1193180L / freq;
+
+   outp(0x61, port_val|3);
+   outp(0x43, 0xb6);
+   outp(0x42, freq&0xFF);
+   outp(0x42, (freq>>8)&0xFF);
+}
+
+nosound()
+{
+   if( port_val )
+      outp(0x61, port_val);
+   else
+      outp(0x61, inp(0x61)&~3);
+}
+
diff --git a/libc/msdos/time.c b/libc/msdos/time.c
index 271ea05..7f7b183 100644
--- a/libc/msdos/time.c
+++ b/libc/msdos/time.c
@@ -53,9 +53,10 @@ time_t *timer;
   rv >>= 8; year = (rv & 0xFFFF) - 1970;
 
   if (month <= 1 || year & 3)	/* if before Feb or not a leap year	*/
-	day--;			/* don't add day for leap year		*/
+	day--;			/* don't add day for this leap year	*/
   day += mdays[month];		/* day in year				*/
-  day += (year + 3) >> 2;	/* add a day for each leap year		*/
+  day += (year + 3) >> 2;	/* add a day for each leap year, but 	*/
+  				/* don't worry about 2100 		*/
   t += ((year * 365L) + day) * SECSPERDAY;
   if (timer)
 	*timer = t;
diff --git a/libc/stdio2/stdio.c b/libc/stdio2/stdio.c
index c317859..6b0dba0 100644
--- a/libc/stdio2/stdio.c
+++ b/libc/stdio2/stdio.c
@@ -675,6 +675,11 @@ char *mode;
    {
       if (nfp)
 	 free(nfp);
+      if (fp)
+      {
+	 fp->mode |= fopen_mode;
+	 fclose(fp);			/* Deallocate if required */
+      }
       return 0;
    }
 
@@ -730,12 +735,15 @@ FILE *fp;
       errno = EINVAL;
       return EOF;
    }
-   if (fflush(fp))
-      return EOF;
+   if (fp->fd != -1)
+   {
+      if (fflush(fp))
+	 return EOF;
 
-   if (close(fp->fd))
-      rv = EOF;
-   fp->fd = -1;
+      if (close(fp->fd))
+	 rv = EOF;
+      fp->fd = -1;
+   }
 
    if (fp->mode & __MODE_FREEBUF)
    {
diff --git a/libc/stdio2/stdio.h b/libc/stdio2/stdio.h
index 98ca38a..fd10923 100644
--- a/libc/stdio2/stdio.h
+++ b/libc/stdio2/stdio.h
@@ -56,7 +56,7 @@ struct __stdio_file {
 
 #define EOF	(-1)
 #ifndef NULL
-#define NULL	(0)
+#define NULL	((void*)0)
 #endif
 
 typedef struct __stdio_file FILE;
diff --git a/libc/string/string.c b/libc/string/string.c
index ffce96c..705ec55 100644
--- a/libc/string/string.c
+++ b/libc/string/string.c
@@ -382,8 +382,9 @@ size_t l;
 
   mov	ax,di
 #endif
-  		; If di is odd mov 1 byte before doing word move
-		; this will speed slightly but
+  		; If di is odd we could mov 1 byte before doing word move
+		; as this would speed the copy slightly but its probably
+		; too rare to be worthwhile.
 		; NB 8086 has no problem with mis-aligned access.
 
   shr	cx,#1	; Do this faster by doing a mov word
@@ -647,8 +648,16 @@ unsigned int srcseg, srcoff, destseg, destoff, len;
   mov	di,[bp+8]
   mov	cx,[bp+10]
 #endif
+
+  ; Would it me a good idea to normalise the pointers ?
+  ; How about allowing for overlapping moves ?
+
+  shr	cx,#1	; Do this faster by doing a mov word
   rep
-   movsb
+  movsw
+  adc	cx,cx	; Retrieve the leftover 1 bit from cflag.
+  rep
+  movsb
 
   ! cli			! Are we _really_ paranoid ?