Changeset 3438 for trunk/src/kash/expand.c

Timestamp:

Sep 9, 2020, 10:01:39 PM (5 years ago)

Author:

bird

Message:

kash: Hammering on threaded mode.

File:

• trunk/src/kash/expand.c (modified) (6 diffs)

trunk/src/kash/expand.c

@@ -89 +89 @@
 
 STATIC void argstr(shinstance *, char *, int);
+STATIC void expari(shinstance *, int);
 STATIC char *exptilde(shinstance *, char *, int);
 STATIC void expbackq(shinstance *, union node *, int, int);
@@ -106 +107 @@
 STATIC int pmatch(char *, char *, int);
 STATIC char *cvtnum(shinstance *, int, char *);
+STATIC char *cvtnum64(shinstance *, KI64, char *);
 
 /*
@@ -343 +345 @@
  * evaluate, place result in (backed up) result, adjust string position.
  */
-void
+STATIC void
 expari(shinstance *psh, int flag)
 {
@@ -869 +871 @@
         switch (*name) {
         case '$':
+#ifndef SH_FORKED_MODE
+                psh->expdest = cvtnum64(psh, psh->rootpid, psh->expdest);
+                break;
+#else
                 num = psh->rootpid;
                 goto numvar;
+#endif
         case '?':
                 num = psh->exitstatus;
@@ -876 +883 @@
         case '#':
                 num = psh->shellparam.nparam;
-                goto numvar;
-        case '!':
-                num = psh->backgndpid;
 numvar:
                 psh->expdest = cvtnum(psh, num, psh->expdest);
                 break;
+        case '!':
+#ifndef SH_FORKED_MODE
+                psh->expdest = cvtnum64(psh, psh->backgndpid, psh->expdest);
+                break;
+#else
+                num = psh->backgndpid;
+                goto numvar;
+#endif
         case '-':
                 for (i = 0; psh->optlist[i].name; i++) {
@@ -1561 +1573 @@
 }
 
+STATIC char *
+cvtnum64(shinstance *psh, KI64 num, char *buf)
+{
+        char temp[32];
+        int neg = num < 0;
+        char *p = temp + 31;
+
+        temp[31] = '\0';
+
+        do {
+                *--p = num % 10 + '0';
+        } while ((num /= 10) != 0);
+
+        if (neg)
+                *--p = '-';
+
+        while (*p)
+                STPUTC(psh, *p++, buf);
+        return buf;
+}
+
 /*
  * Do most of the work for wordexp(3).