lint

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

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index 7c00b67..1fb93e9 100644 (file)
--- a/usr/src/sys/kern/sys_generic.c
+++ b/usr/src/sys/kern/sys_generic.c
@@ -1,4 +1,4 @@
-/*     sys_generic.c   5.16    82/10/13        */
+/*     sys_generic.c   5.21    82/10/21        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -21,6 +21,7 @@
 #endif
 #include "../h/descrip.h"
 #include "../h/uio.h"
 #endif
 #include "../h/descrip.h"
 #include "../h/uio.h"

+#include "../h/cmap.h"

 
 /*
  * Read system call.
 
 /*
  * Read system call.


@@ -200,8 +201,7 @@ rwip(ip, uio, rw)
        struct buf *bp;
        struct fs *fs;
        daddr_t lbn, bn;
        struct buf *bp;
        struct fs *fs;
        daddr_t lbn, bn;

-       register int on, type;
-       register unsigned n;
+       register int n, on, type;

        int size;
        long bsize;
        extern int mem_no;
        int size;
        long bsize;
        extern int mem_no;


@@ -275,6 +275,7 @@ rwip(ip, uio, rw)
                        ip->i_lastr = lbn;
                } else {
                        int i, count;
                        ip->i_lastr = lbn;
                } else {
                        int i, count;

+                       extern struct cmap *mfind();

 
                        count = howmany(size, DEV_BSIZE);
                        for (i = 0; i < count; i += CLSIZE)
 
                        count = howmany(size, DEV_BSIZE);
                        for (i = 0; i < count; i += CLSIZE)


@@ -292,7 +293,7 @@ rwip(ip, uio, rw)
                        goto bad;
                }
                u.u_error =
                        goto bad;
                }
                u.u_error =

-                   uiomove(bp->b_un.b_addr+on, (u_int)n, rw, uio);
+                   uiomove(bp->b_un.b_addr+on, n, rw, uio);

                if (rw == UIO_READ) {
                        if (n + on == bsize || uio->uio_offset == ip->i_size)
                                bp->b_flags |= B_AGE;
                if (rw == UIO_READ) {
                        if (n + on == bsize || uio->uio_offset == ip->i_size)
                                bp->b_flags |= B_AGE;


@@ -404,6 +405,7 @@ again:
        return (0);
 }
 
        return (0);
 }
 

+#ifdef notdef

 /*
  * Get next character written in by user from uio.
  */
 /*
  * Get next character written in by user from uio.
  */


@@ -444,6 +446,7 @@ again:
        uio->uio_offset++;
        return (c & 0377);
 }
        uio->uio_offset++;
        return (c & 0377);
 }

+#endif

 
 /*
  * Ioctl system call
 
 /*
  * Ioctl system call


@@ -518,7 +521,7 @@ ioctl()
                bzero((caddr_t)data, size);
 
        if (fp->f_type == DTYPE_SOCKET)
                bzero((caddr_t)data, size);
 
        if (fp->f_type == DTYPE_SOCKET)

-               soioctl(fp->f_socket, com, data);
+               u.u_error = soioctl(fp->f_socket, com, data);

        else {
                register struct inode *ip = fp->f_inode;
                int fmt = ip->i_mode & IFMT;
        else {
                register struct inode *ip = fp->f_inode;
                int fmt = ip->i_mode & IFMT;


@@ -539,7 +542,7 @@ ioctl()
                        u.u_eosys = RESTARTSYS;
                        return;
                }
                        u.u_eosys = RESTARTSYS;
                        return;
                }

-               (*cdevsw[major(dev)].d_ioctl)(dev, com, data, 0);
+               u.u_error = (*cdevsw[major(dev)].d_ioctl)(dev, com, data, 0);

        }
 
 returndata:
        }
 
 returndata:


@@ -566,7 +569,7 @@ nullioctl(tp, cmd, data, flags)
 #ifdef lint
        tp = tp; data = data; flags = flags;
 #endif
 #ifdef lint
        tp = tp; data = data; flags = flags;
 #endif

-       return (cmd);
+       return (-1);

 }
 
 ostty()
 }
 
 ostty()