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

Timestamp:

Oct 7, 2007, 12:04:05 AM (18 years ago)

Author:

bird

Message:

moving globals into shinstance...

File:

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

trunk/src/kash/output.c

@@ -71 +71 @@
 #include "error.h"
 
-
-#define OUTBUFSIZ BUFSIZ
+#include "shinstance.h"
+
+//#define OUTBUFSIZ BUFSIZ
 #define BLOCK_OUT -2            /* output to a fixed block of memory */
-#define MEM_OUT -3              /* output to dynamically allocated memory */
+//#define MEM_OUT -3            /* output to dynamically allocated memory */
 #define OUTPUT_ERR 01           /* error occurred on output */
 
 
-struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
-struct output errout = {NULL, 0, NULL, 100, 2, 0};
-struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
-struct output *out1 = &output;
-struct output *out2 = &errout;
+//struct output output = {NULL, 0, NULL, OUTBUFSIZ, 1, 0};
+//struct output errout = {NULL, 0, NULL, 100, 2, 0};
+//struct output memout = {NULL, 0, NULL, 0, MEM_OUT, 0};
+//struct output *out1 = &output;
+//struct output *out2 = &errout;
 
 
@@ -92 +93 @@
 
 RESET {
-        out1 = &output;
-        out2 = &errout;
-        if (memout.buf != NULL) {
-                ckfree(memout.buf);
-                memout.buf = NULL;
+        psh->out1 = &psh->output;
+        psh->out2 = &psh->errout;
+        if (psh->memout.buf != NULL) {
+                ckfree(psh->memout.buf);
+                psh->memout.buf = NULL;
         }
 }
@@ -120 +121 @@
 
 void
-out1str(const char *p)
-{
-        outstr(p, out1);
-}
-
-
-void
-out2str(const char *p)
-{
-        outstr(p, out2);
+out1str(shinstance *psh, const char *p)
+{
+        outstr(p, psh->out1);
+}
+
+
+void
+out2str(shinstance *psh, const char *p)
+{
+        outstr(p, psh->out2);
 }
 
@@ -138 +139 @@
         while (*p)
                 outc(*p++, file);
-        if (file == out2)
+        if (file == file->psh->out2)
                 flushout(file);
 }
@@ -150 +151 @@
 {
         int offset;
+        shinstance *psh = dest->psh;
 
         if (dest->fd == BLOCK_OUT) {
@@ -177 +179 @@
 
 void
-output_flushall(void)
-{
-        flushout(&output);
-        flushout(&errout);
+output_flushall(shinstance *psh)
+{
+        flushout(&psh->output);
+        flushout(&psh->errout);
 }
 
@@ -190 +192 @@
         if (dest->buf == NULL || dest->nextc == dest->buf || dest->fd < 0)
                 return;
-        if (xwrite(psh, dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
+        if (xwrite(dest->psh, dest->fd, dest->buf, dest->nextc - dest->buf) < 0)
                 dest->flags |= OUTPUT_ERR;
         dest->nextc = dest->buf;
@@ -198 +200 @@
 
 void
-freestdout(void)
+freestdout(shinstance *psh)
 {
         INTOFF;
-        if (output.buf) {
-                ckfree(output.buf);
-                output.buf = NULL;
-                output.nleft = 0;
+        if (psh->output.buf) {
+                ckfree(psh->output.buf);
+                psh->output.buf = NULL;
+                psh->output.nleft = 0;
         }
         INTON;
@@ -222 +224 @@
 
 void
-out1fmt(const char *fmt, ...)
+out1fmt(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        doformat(out1, fmt, ap);
+        doformat(psh->out1, fmt, ap);
         va_end(ap);
 }
 
 void
-dprintf(const char *fmt, ...)
+dprintf(shinstance *psh, const char *fmt, ...)
 {
         va_list ap;
 
         va_start(ap, fmt);
-        doformat(out2, fmt, ap);
+        doformat(psh->out2, fmt, ap);
         va_end(ap);
-        flushout(out2);
+        flushout(psh->out2);
 }
 
@@ -250 +252 @@
         va_start(ap, fmt);
         strout.nextc = outbuf;
-        strout.nleft = length;
+        strout.nleft = (int)length;
         strout.fd = BLOCK_OUT;
         strout.flags = 0;
@@ -414 +416 @@
                                 num /= base;
                         }
-                        len = (temp + TEMPSIZE - 1) - p;
+                        len = (int)((temp + TEMPSIZE - 1) - p);
                         if (prec < 0)
                                 prec = 1;
@@ -445 +447 @@
                         pad = 0;
                         if (width) {
-                                len = strlen(p);
+                                len = (int)strlen(p);
                                 if (prec >= 0 && len > prec)
                                         len = prec;
@@ -480 +482 @@
 
 int
-xwrite(shinstance *psh, int fd, char *buf, int nbytes)
+xwrite(shinstance *psh, int fd, char *buf, size_t nbytes)
 {
         int ntry;
-        int i;
-        int n;
+        long i;
+        size_t n;
 
         n = nbytes;
@@ -492 +494 @@
                 if (i > 0) {
                         if ((n -= i) <= 0)
-                                return nbytes;
+                                return (int)nbytes;
                         buf += i;
                         ntry = 0;
                 } else if (i == 0) {
                         if (++ntry > 10)
-                                return nbytes - n;
+                                return (int)(nbytes - n);
                 } else if (errno != EINTR) {
                         return -1;
@@ -505 +507 @@
 
 
+#ifdef not_used
 /*
  * Version of ioctl that retries after a signal is caught.
@@ -518 +521 @@
         return i;
 }
+#endif /* not_used */