first use of readip()

SCCS-vsn: sys/kern/kern_proc.c 4.31
SCCS-vsn: sys/kern/sys_generic.c 5.7

diff --git a/usr/src/sys/kern/kern_proc.c b/usr/src/sys/kern/kern_proc.c
index ae96224..7942e36 100644 (file)
--- a/usr/src/sys/kern/kern_proc.c
+++ b/usr/src/sys/kern/kern_proc.c
@@ -1,4 +1,4 @@
-/*     kern_proc.c     4.30    82/08/10        */
+/*     kern_proc.c     4.31    82/08/11        */

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


@@ -21,6 +21,7 @@
 #include "../h/file.h"
 #include "../h/quota.h"
 #include "../h/descrip.h"
 #include "../h/file.h"
 #include "../h/quota.h"
 #include "../h/descrip.h"

+#include "../h/uio.h"

 
 /*
  * exec system call, with and without environments.
 
 /*
  * exec system call, with and without environments.


@@ -50,6 +51,8 @@ exece()
        swblk_t bno;
        char cfname[MAXNAMLEN + 1];
        char cfarg[SHSIZE];
        swblk_t bno;
        char cfname[MAXNAMLEN + 1];
        char cfarg[SHSIZE];

+       struct uio uio;
+       struct iovec iovec;

 
        if ((ip = namei(uchar, 0, 1)) == NULL)
                return;
 
        if ((ip = namei(uchar, 0, 1)) == NULL)
                return;


@@ -88,14 +91,16 @@ exece()
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */
         * ONLY ONE ARGUMENT MAY BE PASSED TO THE SHELL FROM
         * THE ASCII LINE.
         */

-       u.u_base = (caddr_t)&u.u_exdata;
-       u.u_count = sizeof(u.u_exdata);
-       u.u_offset = 0;
-       u.u_segflg = 1;
-       readi(ip);
-       u.u_segflg = 0;
+       uio.uio_iov = &iovec;
+       uio.uio_iovcnt = 1;
+       iovec.iov_base = (caddr_t)&u.u_exdata;
+       iovec.iov_len = sizeof (u.u_exdata);
+       uio.uio_offset = 0;
+       uio.uio_segflg = 1;
+       u.u_error = readip(ip, &uio);

        if (u.u_error)
                goto bad;
        if (u.u_error)
                goto bad;

+       u.u_count = uio.uio_resid;

        if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
            u.u_exdata.ux_shell[0] != '#') {
                u.u_error = ENOEXEC;
        if (u.u_count > sizeof(u.u_exdata) - sizeof(u.u_exdata.Ux_A) &&
            u.u_exdata.ux_shell[0] != '#') {
                u.u_error = ENOEXEC;

diff --git a/usr/src/sys/kern/sys_generic.c b/usr/src/sys/kern/sys_generic.c
index b72ebd2..1f99bcc 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.6     82/08/10        */
+/*     sys_generic.c   5.7     82/08/11        */

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


@@ -23,6 +23,7 @@
 #define        CHARGE(nothing)
 #endif
 #include "../h/descrip.h"
 #define        CHARGE(nothing)
 #endif
 #include "../h/descrip.h"

+#include "../h/uio.h"

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


@@ -489,3 +490,108 @@ iomove(cp, n, flag)
        u.u_offset += n;
        u.u_count -= n;
 }
        u.u_offset += n;
        u.u_count -= n;
 }

+
+readip(ip, uio)
+       register struct inode *ip;
+       register struct uio *uio;
+{
+       register struct iovec *iov = uio->uio_iov;
+       struct buf *bp;
+       struct fs *fs;
+       dev_t dev;
+       daddr_t lbn, bn;
+       off_t diff;
+       register int on, type;
+       register unsigned n;
+       int size;
+       long bsize;
+       extern int mem_no;
+       int error = 0;
+
+       uio->uio_resid = 0;
+       if (uio->uio_iovcnt == 0)
+               return (0);
+       dev = (dev_t)ip->i_rdev;
+       if (uio->uio_offset < 0 &&
+           ((ip->i_mode&IFMT) != IFCHR || mem_no != major(dev))) {
+               error = EINVAL;
+               goto bad;
+       }
+       ip->i_flag |= IACC;
+       type = ip->i_mode&IFMT;
+       if (type == IFCHR) {
+               register c = u.u_count;
+               error = (*cdevsw[major(dev)].d_read)(dev, uio);
+               CHARGE(sc_tio * (c - u.u_count));
+               return (error);
+       }
+       if (type != IFBLK) {
+               dev = ip->i_dev;
+               fs = ip->i_fs;
+               bsize = fs->fs_bsize;
+       } else
+               bsize = BLKDEV_IOSIZE;
+nextiov:
+       if (uio->uio_iovcnt == 0)
+               goto getresid;
+       if (iov->iov_len > 0)
+       do {
+               lbn = uio->uio_offset / bsize;
+               on = uio->uio_offset % bsize;
+               n = MIN((unsigned)(bsize - on), iov->iov_len);
+               if (type != IFBLK) {
+                       diff = ip->i_size - uio->uio_offset;
+                       if (diff <= 0)
+                               return;
+                       if (diff < n)
+                               n = diff;
+                       bn = fsbtodb(fs, bmap(ip, lbn, B_READ));
+                       if (u.u_error)
+                               goto getresid;
+                       size = blksize(fs, ip, lbn);
+               } else {
+                       size = bsize;
+                       bn = lbn * (BLKDEV_IOSIZE/DEV_BSIZE);
+                       rablock = bn + (BLKDEV_IOSIZE/DEV_BSIZE);
+                       rasize = bsize;
+               }
+               if ((long)bn<0) {
+                       bp = geteblk(size);
+                       clrbuf(bp);
+               } else if (ip->i_lastr + 1 == lbn)
+                       bp = breada(dev, bn, size, rablock, rasize);
+               else
+                       bp = bread(dev, bn, size);
+               ip->i_lastr = lbn;
+               n = MIN(n, size - bp->b_resid);
+               if (n != 0) {
+                       if (uio->uio_segflg != 1) {
+                               if (copyout(bp->b_un.b_addr+on, iov->iov_base, n)) {
+                                       error = EFAULT;
+                                       goto getresid;
+                               }
+                       } else
+                               bcopy(bp->b_un.b_addr + on, iov->iov_base, n);
+                       iov->iov_base += n;
+                       uio->uio_offset += n;
+                       iov->iov_len -= n;
+bad:
+                       ;
+               }
+               if (n + on == bsize || uio->uio_offset == ip->i_size)
+                       bp->b_flags |= B_AGE;
+               brelse(bp);
+       } while (u.u_error == 0 && iov->iov_len != 0 && n != 0);
+       if (u.u_error == 0 && n > 0) {
+               iov++;
+               uio->uio_iovcnt--;
+               goto nextiov;
+       }
+getresid:
+       while (uio->uio_iovcnt > 0) {
+               uio->uio_resid += iov->iov_len;
+               iov++;
+               uio->uio_iovcnt--;
+       }
+       return (error);
+}