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

Timestamp:

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

Author:

bird

Message:

moving globals into shinstance...

File:

• trunk/src/kash/miscbltin.c (modified) (11 diffs)

trunk/src/kash/miscbltin.c

@@ -113 +113 @@
 
         if (prompt && isatty(0)) {
-                out2str(prompt);
-                output_flushall();
+                out2str(psh, prompt);
+                output_flushall(psh);
         }
 
         if (*(ap = argptr) == NULL)
-                error("arg count");
+                error(psh, "arg count");
 
         if ((ifs = bltinlookup("IFS", 1)) == NULL)
@@ -261 +261 @@
                         o[i] = '\0';
 
-                        out1fmt("u=%s,g=%s,o=%s\n", u, g, o);
+                        out1fmt(psh, "u=%s,g=%s,o=%s\n", u, g, o);
                 } else {
-                        out1fmt("%.4o\n", mask);
+                        out1fmt(psh, "%.4o\n", mask);
                 }
         } else {
@@ -270 +270 @@
                         do {
                                 if (*ap >= '8' || *ap < '0')
-                                        error("Illegal number: %s", argv[1]);
+                                        error(psh, "Illegal number: %s", argv[1]);
                                 mask = (mask << 3) + (*ap - '0');
                         } while (*++ap != '\0');
@@ -288 +288 @@
                         INTON;
                         if (!set)
-                                error("Illegal mode: %s", ap);
+                                error(psh, "Illegal mode: %s", ap);
 
                         umask(~mask & 0777);
@@ -384 +384 @@
                 ;
         if (!l->name)
-                error("internal error (%c)", what);
+                error(psh, "internal error (%c)", what);
 
         set = *argptr ? 1 : 0;
@@ -391 +391 @@
 
                 if (all || argptr[1])
-                        error("too many arguments");
+                        error(psh, "too many arguments");
                 if (strcmp(p, "unlimited") == 0)
                         val = RLIM_INFINITY;
@@ -404 +404 @@
                         }
                         if (c)
-                                error("bad number");
+                                error(psh, "bad number");
                         val *= l->factor;
                 }
@@ -416 +416 @@
                                 val = limit.rlim_max;
 
-                        out1fmt("%-20s ", l->name);
+                        out1fmt(psh, "%-20s ", l->name);
                         if (val == RLIM_INFINITY)
                                 out1fmt("unlimited\n");
@@ -423 +423 @@
                                 val /= l->factor;
 #ifdef BSD4_4
-                                out1fmt("%lld\n", (long long) val);
+                                out1fmt(psh, "%lld\n", (long long) val);
 #else
-                                out1fmt("%ld\n", (long) val);
+                                out1fmt(psh, "%ld\n", (long) val);
 #endif
                         }
@@ -439 +439 @@
                         limit.rlim_cur = val;
                 if (setrlimit(l->cmd, &limit) < 0)
-                        error("error setting limit (%s)", strerror(errno));
+                        error(psh, "error setting limit (%s)", strerror(errno));
         } else {
                 if (how & SOFT)
@@ -447 +447 @@
 
                 if (val == RLIM_INFINITY)
-                        out1fmt("unlimited\n");
+                        out1fmt(psh, "unlimited\n");
                 else
                 {
                         val /= l->factor;
 #ifdef BSD4_4
-                        out1fmt("%lld\n", (long long) val);
+                        out1fmt(psh, "%lld\n", (long long) val);
 #else
-                        out1fmt("%ld\n", (long) val);
+                        out1fmt(psh, "%ld\n", (long) val);
 #endif
                 }