move copyin() call so if uap->size pointer is null, still return size

[unix-history] / usr / src / sys / kern / tty_compat.c

diff --git a/usr/src/sys/kern/tty_compat.c b/usr/src/sys/kern/tty_compat.c
index aae8baf..0b62225 100644 (file)
--- a/usr/src/sys/kern/tty_compat.c
+++ b/usr/src/sys/kern/tty_compat.c
@@ -1,9 +1,10 @@
-/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)tty_compat.c        7.7 (Berkeley) %G%
+ * %sccs.include.redist.c%
+ *
+ *     @(#)tty_compat.c        7.10 (Berkeley) %G%

  */
 
 /* 
  */
 
 /* 


@@ -13,7 +14,6 @@
 
 #include "param.h"
 #include "systm.h"
 
 #include "param.h"
 #include "systm.h"

-#include "user.h"

 #include "ioctl.h"
 #include "tty.h"
 #include "termios.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "termios.h"


@@ -21,12 +21,9 @@
 #include "file.h"
 #include "conf.h"
 #include "dkstat.h"
 #include "file.h"
 #include "conf.h"
 #include "dkstat.h"

-#include "uio.h"

 #include "kernel.h"
 #include "syslog.h"
 
 #include "kernel.h"
 #include "syslog.h"
 

-#include "machine/reg.h"
-

 int ttydebug = 0;
 
 static struct speedtab compatspeeds[] = {
 int ttydebug = 0;
 
 static struct speedtab compatspeeds[] = {


@@ -53,16 +50,6 @@ static int compatspcodes[16] = {
        1800, 2400, 4800, 9600, 19200, 38400,
 };
 
        1800, 2400, 4800, 9600, 19200, 38400,
 };
 

-ttspeedtab(speed, table)
-       register struct speedtab *table;
-{
-
-       for ( ; table->sp_speed != -1; table++)
-               if (table->sp_speed == speed)
-                       return (table->sp_code);
-       return (-1);
-}
-

 /*ARGSUSED*/
 ttcompat(tp, com, data, flag)
        register struct tty *tp;
 /*ARGSUSED*/
 ttcompat(tp, com, data, flag)
        register struct tty *tp;