Changeset 1198 for trunk/src/kash/output.c

Timestamp:

Oct 6, 2007, 11:19:19 PM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/output.c (modified) (4 diffs)

trunk/src/kash/output.c

@@ -190 +190 @@
         if (dest->buf == NULL || dest->nextc == dest->buf || dest->fd < 0)
                 return;
-        if (xwrite(dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
+        if (xwrite(psh, dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
                 dest->flags |= OUTPUT_ERR;
         dest->nextc = dest->buf;
@@ -480 +480 @@
 
 int
-xwrite(int fd, char *buf, int nbytes)
+xwrite(shinstance *psh, int fd, char *buf, int nbytes)
 {
         int ntry;
@@ -489 +489 @@
         ntry = 0;
         for (;;) {
-                i = write(fd, buf, n);
+                i = shfile_write(&psh->fdtab, fd, buf, n);
                 if (i > 0) {
                         if ((n -= i) <= 0)
@@ -511 +511 @@
 
 int
-xioctl(int fd, unsigned long request, char *arg)
+xioctl(shinstance *psh, int fd, unsigned long request, char *arg)
 {
         int i;
 
-        while ((i = ioctl(fd, request, arg)) == -1 && errno == EINTR);
+        while ((i = shfile_ioctl(&psh->fdtab, fd, request, arg)) == -1 && errno == EINTR);
         return i;
 }