ash: rename got_sigchld, doing_jobctl, and INT_ON/OFF to match dash

Merge upstream commit 9f490785e.  The changes are cosmetic, to
bring the code into line with dash.

1 files changed, 158 insertions, 158 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 656f3d73b..dd3c885f4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -595,7 +595,7 @@ struct globals_misc {
          */
         volatile /*sig_atomic_t*/ smallint pending_int; /* 1 = got SIGINT */
 #if !ENABLE_PLATFORM_MINGW32
-        volatile /*sig_atomic_t*/ smallint got_sigchld; /* 1 = got SIGCHLD */
+        volatile /*sig_atomic_t*/ smallint gotsigchld; /* 1 = got SIGCHLD */
         volatile /*sig_atomic_t*/ smallint pending_sig; /* last pending signal */
 #endif
         smallint exception_type; /* kind of exception: */
@@ -708,7 +708,7 @@ extern struct globals_misc *BB_GLOBAL_CONST ash_ptr_to_globals_misc;
 #define exception_type    (G_misc.exception_type   )
 #define suppress_int      (G_misc.suppress_int     )
 #define pending_int       (G_misc.pending_int      )
-#define got_sigchld       (G_misc.got_sigchld      )
+#define gotsigchld        (G_misc.gotsigchld       )
 #define pending_sig       (G_misc.pending_sig      )
 #define nullstr     (G_misc.nullstr    )
 #define optlist     (G_misc.optlist    )
@@ -860,13 +860,13 @@ static void exitshell(void) NORETURN;
  * more fun than worrying about efficiency and portability. :-))
  */
 #if DEBUG_INTONOFF
-# define INT_OFF do { \
-        TRACE(("%s:%d INT_OFF(%d)\n", __func__, __LINE__, suppress_int)); \
+# define INTOFF do { \
+        TRACE(("%s:%d INTOFF(%d)\n", __func__, __LINE__, suppress_int)); \
         suppress_int++; \
         barrier(); \
 } while (0)
 #else
-# define INT_OFF do { \
+# define INTOFF do { \
         suppress_int++; \
         barrier(); \
 } while (0)
@@ -885,7 +885,7 @@ raise_exception(int e)
         if (exception_handler == NULL)
                 abort();
 #endif
-        INT_OFF;
+        INTOFF;
         exception_type = e;
         longjmp(exception_handler->loc, 1);
 }
@@ -900,7 +900,7 @@ raise_exception(int e)
  * Called when a SIGINT is received.  (If the user specifies
  * that SIGINT is to be trapped or ignored using the trap builtin, then
  * this routine is not called.)  suppress_int is nonzero when interrupts
- * are held using the INT_OFF macro.  (The test for iflag is just
+ * are held using the INTOFF macro.  (The test for iflag is just
  * defensive programming.)
  */
 static void raise_interrupt(void) IF_NOT_PLATFORM_MINGW32(NORETURN);
@@ -958,12 +958,12 @@ int_on(void)
         barrier();
 }
 #if DEBUG_INTONOFF
-# define INT_ON do { \
-        TRACE(("%s:%d INT_ON(%d)\n", __func__, __LINE__, suppress_int-1)); \
+# define INTON do { \
+        TRACE(("%s:%d INTON(%d)\n", __func__, __LINE__, suppress_int-1)); \
         int_on(); \
 } while (0)
 #else
-# define INT_ON int_on()
+# define INTON int_on()
 #endif
 static IF_NOT_ASH_OPTIMIZE_FOR_SIZE(inline) void
 force_int_on(void)
@@ -974,7 +974,7 @@ force_int_on(void)
                 raise_interrupt(); /* does not return */
         barrier();
 }
-#define FORCE_INT_ON force_int_on()
+#define FORCEINTON force_int_on()
 
 #define SAVE_INT(v) ((v) = suppress_int)
 
@@ -992,27 +992,27 @@ force_int_on(void)
 static void
 outstr(const char *p, FILE *file)
 {
-        INT_OFF;
+        INTOFF;
         fputs(p, file);
-        INT_ON;
+        INTON;
 }
 
 static void
 flush_stdout_stderr(void)
 {
-        INT_OFF;
+        INTOFF;
         fflush_all();
-        INT_ON;
+        INTON;
 }
 
 /* Was called outcslow(c,FILE*), but c was always '\n' */
 static void
 newline_and_flush(FILE *dest)
 {
-        INT_OFF;
+        INTOFF;
         putc('\n', dest);
         fflush(dest);
-        INT_ON;
+        INTON;
 }
 
 static int out1fmt(const char *, ...) __attribute__((__format__(__printf__,1,2)));
@@ -1022,11 +1022,11 @@ out1fmt(const char *fmt, ...)
         va_list ap;
         int r;
 
-        INT_OFF;
+        INTOFF;
         va_start(ap, fmt);
         r = vprintf(fmt, ap);
         va_end(ap);
-        INT_ON;
+        INTON;
         return r;
 }
 
@@ -1037,11 +1037,11 @@ fmtstr(char *outbuf, size_t length, const char *fmt, ...)
         va_list ap;
         int ret;
 
-        INT_OFF;
+        INTOFF;
         va_start(ap, fmt);
         ret = vsnprintf(outbuf, length, fmt, ap);
         va_end(ap);
-        INT_ON;
+        INTON;
         return ret > (int)length ? length : ret;
 }
 
@@ -1896,14 +1896,14 @@ stalloc(size_t nbytes)
                 len = sizeof(struct stack_block) - MINSIZE + blocksize;
                 if (len < blocksize)
                         ash_msg_and_raise_error(bb_msg_memory_exhausted);
-                INT_OFF;
+                INTOFF;
                 sp = ckmalloc(len);
                 sp->prev = g_stackp;
                 g_stacknxt = sp->space;
                 g_stacknleft = blocksize;
                 sstrend = g_stacknxt + blocksize;
                 g_stackp = sp;
-                INT_ON;
+                INTON;
         }
         p = g_stacknxt;
         g_stacknxt += aligned;
@@ -1969,7 +1969,7 @@ popstackmark(struct stackmark *mark)
         if (!mark->stackp)
                 return;
 
-        INT_OFF;
+        INTOFF;
         while (g_stackp != mark->stackp) {
                 sp = g_stackp;
                 g_stackp = sp->prev;
@@ -1978,7 +1978,7 @@ popstackmark(struct stackmark *mark)
         g_stacknxt = mark->stacknxt;
         g_stacknleft = mark->stacknleft;
         sstrend = mark->stacknxt + mark->stacknleft;
-        INT_ON;
+        INTON;
 }
 
 /*
@@ -2007,7 +2007,7 @@ growstackblock(size_t min)
                 struct stack_block *prevstackp;
                 size_t grosslen;
 
-                INT_OFF;
+                INTOFF;
                 sp = g_stackp;
                 prevstackp = sp->prev;
                 grosslen = newlen + sizeof(struct stack_block) - MINSIZE;
@@ -2017,7 +2017,7 @@ growstackblock(size_t min)
                 g_stacknxt = sp->space;
                 g_stacknleft = newlen;
                 sstrend = sp->space + newlen;
-                INT_ON;
+                INTON;
         } else {
                 char *oldspace = g_stacknxt;
                 size_t oldlen = g_stacknleft;
@@ -2877,7 +2877,7 @@ setvar(const char *name, const char *val, int flags)
                 vallen = strlen(val);
         }
 
-        INT_OFF;
+        INTOFF;
         nameeq = ckzalloc(namelen + vallen + 2);
         p = mempcpy(nameeq, name, namelen);
         if (val) {
@@ -2885,7 +2885,7 @@ setvar(const char *name, const char *val, int flags)
                 strcpy(p, val);
         }
         vp = setvareq(nameeq, flags | VNOSAVE);
-        INT_ON;
+        INTON;
 
         return vp;
 }
@@ -3440,7 +3440,7 @@ setpwd(const char *val, int setold)
         if (setold) {
                 setvar("OLDPWD", oldcur, VEXPORT);
         }
-        INT_OFF;
+        INTOFF;
         if (physdir != nullstr) {
                 if (physdir != oldcur)
                         free(physdir);
@@ -3457,7 +3457,7 @@ setpwd(const char *val, int setold)
                 free(oldcur);
         }
         curdir = dir;
-        INT_ON;
+        INTON;
         setvar("PWD", dir, VEXPORT);
 }
 
@@ -3475,7 +3475,7 @@ docd(const char *dest, int flags)
 
         TRACE(("docd(\"%s\", %d) called\n", dest, flags));
 
-        INT_OFF;
+        INTOFF;
         if (!(flags & CD_PHYSICAL)) {
                 dir = updatepwd(dest);
                 if (dir)
@@ -3487,7 +3487,7 @@ docd(const char *dest, int flags)
         setpwd(dir, 1);
         hashcd();
  out:
-        INT_ON;
+        INTON;
         return err;
 }
 
@@ -4074,7 +4074,7 @@ setalias(const char *name, const char *val)
 
         app = __lookupalias(name);
         ap = *app;
-        INT_OFF;
+        INTOFF;
         if (ap) {
                 if (!(ap->flag & ALIASINUSE)) {
                         free(ap->val);
@@ -4090,7 +4090,7 @@ setalias(const char *name, const char *val)
                 /*ap->next = NULL;*/
                 *app = ap;
         }
-        INT_ON;
+        INTON;
 }
 
 static int
@@ -4101,9 +4101,9 @@ unalias(const char *name)
         app = __lookupalias(name);
 
         if (*app) {
-                INT_OFF;
+                INTOFF;
                 *app = freealias(*app);
-                INT_ON;
+                INTON;
                 return 0;
         }
 
@@ -4116,7 +4116,7 @@ rmaliases(void)
         struct alias *ap, **app;
         int i;
 
-        INT_OFF;
+        INTOFF;
         for (i = 0; i < ATABSIZE; i++) {
                 app = &atab[i];
                 for (ap = *app; ap; ap = *app) {
@@ -4126,7 +4126,7 @@ rmaliases(void)
                         }
                 }
         }
-        INT_ON;
+        INTON;
 }
 
 static void
@@ -4254,13 +4254,13 @@ static int forkshell(struct job *, union node *, int);
 static int waitforjob(struct job *);
 
 #if !JOBS && !JOBS_WIN32
-enum { doing_jobctl = 0 };
+enum { jobctl = 0 };
 #define setjobctl(on) do {} while (0)
 #elif JOBS_WIN32
-static smallint doing_jobctl; //references:8
-#define setjobctl(on) do { if (rootshell) doing_jobctl = on; } while (0)
+static smallint jobctl; //references:8
+#define setjobctl(on) do { if (rootshell) jobctl = on; } while (0)
 #else /* JOBS */
-static smallint doing_jobctl; //references:8
+static smallint jobctl; //references:8
 static void setjobctl(int);
 #endif
 
@@ -4286,7 +4286,7 @@ static void
 signal_handler(int signo)
 {
         if (signo == SIGCHLD) {
-                got_sigchld = 1;
+                gotsigchld = 1;
                 if (!trap[SIGCHLD])
                         return;
         }
@@ -4658,7 +4658,7 @@ freejob(struct job *jp)
         int i;
 #endif
 
-        INT_OFF;
+        INTOFF;
 #if ENABLE_PLATFORM_POSIX || JOBS_WIN32
         for (i = jp->nprocs, ps = jp->ps; --i >= 0; ps++) {
                 if (ps->ps_cmd != nullstr)
@@ -4669,7 +4669,7 @@ freejob(struct job *jp)
                 free(jp->ps);
         jp->used = 0;
         set_curjob(jp, CUR_DELETE);
-        INT_ON;
+        INTON;
 }
 
 #if JOBS
@@ -4695,7 +4695,7 @@ setjobctl(int on)
         int fd;
         int pgrp;
 
-        if (on == doing_jobctl || rootshell == 0)
+        if (on == jobctl || rootshell == 0)
                 return;
         if (on) {
                 int ofd;
@@ -4755,7 +4755,7 @@ setjobctl(int on)
                 fd = -1;
         }
         ttyfd = fd;
-        doing_jobctl = on;
+        jobctl = on;
 }
 #endif
 
@@ -4844,7 +4844,7 @@ restartjob(struct job *jp, int mode)
         int status;
         pid_t pgid;
 
-        INT_OFF;
+        INTOFF;
         if (jp->state == JOBDONE)
                 goto out;
         jp->state = JOBRUNNING;
@@ -4864,7 +4864,7 @@ restartjob(struct job *jp, int mode)
         } while (--i);
  out:
         status = (mode == FORK_FG) ? waitforjob(jp) : 0;
-        INT_ON;
+        INTON;
         return status;
 }
 
@@ -5001,12 +5001,12 @@ waitproc(int block, int *status)
         int err;
 
 #if JOBS
-        if (doing_jobctl)
+        if (jobctl)
                 flags |= WUNTRACED;
 #endif
 
         do {
-                got_sigchld = 0;
+                gotsigchld = 0;
                 do
                         err = waitpid(-1, status, flags);
                 while (err < 0 && errno == EINTR);
@@ -5016,14 +5016,14 @@ waitproc(int block, int *status)
 
                 sigfillset(&oldmask);
                 sigprocmask2(SIG_SETMASK, &oldmask); /* mask is updated */
-                while (!got_sigchld && !pending_sig)
+                while (!gotsigchld && !pending_sig)
                         sigsuspend(&oldmask);
                 sigprocmask(SIG_SETMASK, &oldmask, NULL);
                 //simpler, but unsafe: a signal can set pending_sig after check, but before pause():
-                //while (!got_sigchld && !pending_sig)
+                //while (!gotsigchld && !pending_sig)
                 //      pause();
 
-        } while (got_sigchld);
+        } while (gotsigchld);
 
         return err;
 #else
@@ -5047,25 +5047,25 @@ waitone(int block, struct job *job)
 
         TRACE(("dowait(0x%x) called\n", block));
 
-        /* It's wrong to call waitpid() outside of INT_OFF region:
+        /* It's wrong to call waitpid() outside of INTOFF region:
          * signal can arrive just after syscall return and handler can
          * longjmp away, losing stop/exit notification processing.
          * Thus, for "jobs" builtin, and for waiting for a fg job,
-         * we call waitpid() (blocking or non-blocking) inside INT_OFF.
+         * we call waitpid() (blocking or non-blocking) inside INTOFF.
          *
          * However, for "wait" builtin it is wrong to simply call waitpid()
-         * in INT_OFF region: "wait" needs to wait for any running job
+         * in INTOFF region: "wait" needs to wait for any running job
          * to change state, but should exit on any trap too.
-         * In INT_OFF region, a signal just before syscall entry can set
+         * In INTOFF region, a signal just before syscall entry can set
          * pending_sig variables, but we can't check them, and we would
          * either enter a sleeping waitpid() (BUG), or need to busy-loop.
          *
-         * Because of this, we run inside INT_OFF, but use a special routine
+         * Because of this, we run inside INTOFF, but use a special routine
          * which combines waitpid() and sigsuspend().
          * This is the reason why we need to have a handler for SIGCHLD:
          * SIG_DFL handler does not wake sigsuspend().
          */
-        INT_OFF;
+        INTOFF;
         pid = waitproc(block, &status);
         TRACE(("wait returns pid %d, status=%d\n", pid, status));
         if (pid <= 0)
@@ -5127,7 +5127,7 @@ waitone(int block, struct job *job)
         }
         /* The process wasn't found in job list */
  out:
-        INT_ON;
+        INTON;
 
 #if BASH_WAIT_N
         if (want_jobexitstatus) {
@@ -5154,7 +5154,7 @@ static int
 dowait(int block, struct job *jp)
 {
 #if !ENABLE_PLATFORM_MINGW32
-        smallint gotchld = *(volatile smallint *)&got_sigchld;
+        smallint gotchld = *(volatile smallint *)&gotsigchld;
         int rpid;
         int pid;
 
@@ -5513,7 +5513,7 @@ makejob(int nprocs)
                 if (jp->state != JOBDONE || !jp->waited)
                         continue;
 #if JOBS || JOBS_WIN32
-                if (doing_jobctl)
+                if (jobctl)
                         continue;
 #endif
                 freejob(jp);
@@ -5522,8 +5522,8 @@ makejob(int nprocs)
         memset(jp, 0, sizeof(*jp));
 #if JOBS
         /* jp->jobctl is a bitfield.
-         * "jp->jobctl |= doing_jobctl" likely to give awful code */
-        if (doing_jobctl)
+         * "jp->jobctl |= jobctl" likely to give awful code */
+        if (jobctl)
                 jp->jobctl = 1;
 #endif
         jp->prev_job = curjob;
@@ -5860,7 +5860,7 @@ clear_traps(void)
 {
         char **tp;
 
-        INT_OFF;
+        INTOFF;
         for (tp = trap; tp <= &trap[NTRAP_LAST]; tp++) {
                 if (*tp && **tp) {      /* trap not NULL or "" (SIG_IGN) */
                         if (trap_ptr == trap)
@@ -5872,7 +5872,7 @@ clear_traps(void)
                 }
         }
         may_have_traps = 0;
-        INT_ON;
+        INTON;
 }
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -5944,7 +5944,7 @@ forkchild(struct job *jp, union node *n, int mode)
         clear_traps();
 #if JOBS
         /* do job control only in root shell */
-        doing_jobctl = 0;
+        jobctl = 0;
         if (mode != FORK_NOJOB && jp->jobctl && oldlvl == 0) {
                 pid_t pgrp;
 
@@ -6052,7 +6052,7 @@ forkparent(struct job *jp, union node *n, int mode, HANDLE proc)
                 ps->ps_proc = proc;
 #endif
 #if JOBS || JOBS_WIN32
-                if (doing_jobctl && n)
+                if (jobctl && n)
                         ps->ps_cmd = commandtext(n);
 #endif
         }
@@ -6604,7 +6604,7 @@ redirect(union node *redir, int flags)
                 return;
 
         sv = NULL;
-        INT_OFF;
+        INTOFF;
         if (flags & REDIR_PUSH)
                 sv = redirlist;
         do {
@@ -6669,7 +6669,7 @@ redirect(union node *redir, int flags)
 #endif
                 }
         } while ((redir = redir->nfile.next) != NULL);
-        INT_ON;
+        INTON;
 
 //dash:#define REDIR_SAVEFD2 03        /* set preverrout */
 #define REDIR_SAVEFD2 0
@@ -6757,7 +6757,7 @@ popredir(int drop)
 
         if (redirlist == NULL)
                 return;
-        INT_OFF;
+        INTOFF;
         rp = redirlist;
         for (i = 0; i < rp->pair_count; i++) {
                 int fd = rp->two_fd[i].orig_fd;
@@ -6777,7 +6777,7 @@ popredir(int drop)
         }
         redirlist = rp->next;
         free(rp);
-        INT_ON;
+        INTON;
 }
 
 static void
@@ -6804,11 +6804,11 @@ ash_arith(const char *s)
         math_state.setvar    = setvar0;
         //math_state.endofname = endofname;
 
-        INT_OFF;
+        INTOFF;
         result = arith(&math_state, s);
         if (math_state.errmsg)
                 ash_msg_and_raise_error(math_state.errmsg);
-        INT_ON;
+        INTON;
 
         return result;
 }
@@ -7029,7 +7029,7 @@ ifsfree(void)
         if (!p)
                 goto out;
 
-        INT_OFF;
+        INTOFF;
         do {
                 struct ifsregion *ifsp;
                 ifsp = p->next;
@@ -7037,7 +7037,7 @@ ifsfree(void)
                 p = ifsp;
         } while (p);
         ifsfirst.next = NULL;
-        INT_ON;
+        INTON;
  out:
         ifslastp = NULL;
 }
@@ -7252,11 +7252,11 @@ recordregion(int start, int end, int nulonly)
         if (ifslastp == NULL) {
                 ifsp = &ifsfirst;
         } else {
-                INT_OFF;
+                INTOFF;
                 ifsp = ckzalloc(sizeof(*ifsp));
                 /*ifsp->next = NULL; - ckzalloc did it */
                 ifslastp->next = ifsp;
-                INT_ON;
+                INTON;
         }
         ifslastp = ifsp;
         ifslastp->begoff = start;
@@ -7273,11 +7273,11 @@ removerecordregions(int endoff)
         if (ifsfirst.endoff > endoff) {
                 while (ifsfirst.next) {
                         struct ifsregion *ifsp;
-                        INT_OFF;
+                        INTOFF;
                         ifsp = ifsfirst.next->next;
                         free(ifsfirst.next);
                         ifsfirst.next = ifsp;
-                        INT_ON;
+                        INTON;
                 }
                 if (ifsfirst.begoff > endoff) {
                         ifslastp = NULL;
@@ -7293,11 +7293,11 @@ removerecordregions(int endoff)
                 ifslastp = ifslastp->next;
         while (ifslastp->next) {
                 struct ifsregion *ifsp;
-                INT_OFF;
+                INTOFF;
                 ifsp = ifslastp->next->next;
                 free(ifslastp->next);
                 ifslastp->next = ifsp;
-                INT_ON;
+                INTON;
         }
         if (ifslastp->endoff > endoff)
                 ifslastp->endoff = endoff;
@@ -7422,7 +7422,7 @@ evalbackcmd(union node *n, struct backcmd *result
 #else
         if (forkshell(jp, n, FORK_NOJOB) == 0) {
                 /* child */
-                FORCE_INT_ON;
+                FORCEINTON;
                 close(pip[ip]);
                 /* ic is index of child end of pipe *and* fd to connect it to */
                 if (pip[ic] != ic) {
@@ -7484,7 +7484,7 @@ expbackq(union node *cmd, int flag IF_BASH_PROCESS_SUBST(, int ctl))
         if (flag & EXP_DISCARD)
                 goto out;
 
-        INT_OFF;
+        INTOFF;
         startloc = expdest - (char *)stackblock();
         pushstackmark(&smark, startloc);
         evalbackcmd(cmd, &in IF_BASH_PROCESS_SUBST(, ctl));
@@ -7518,7 +7518,7 @@ expbackq(union node *cmd, int flag IF_BASH_PROCESS_SUBST(, int ctl))
                 back_exitstatus = waitforjob(in.jp);
         }
  done:
-        INT_ON;
+        INTON;
 
         /* Eat all trailing newlines */
         dest = expdest;
@@ -8622,7 +8622,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                 if (!hasmeta(str->text))
                         goto nometa;
 
-                INT_OFF;
+                INTOFF;
                 p = preglob(str->text, RMESCAPE_ALLOC | RMESCAPE_HEAP);
 // GLOB_NOMAGIC (GNU): if no *?[ chars in pattern, return it even if no match
 // GLOB_NOCHECK: if no match, return unchanged pattern (sans \* escapes?)
@@ -8653,12 +8653,12 @@ expandmeta(struct strlist *str /*, int flag*/)
 #endif
                         addglob(&pglob);
                         globfree(&pglob);
-                        INT_ON;
+                        INTON;
                         break;
                 case GLOB_NOMATCH:
  //nometa2:
                         globfree(&pglob);
-                        INT_ON;
+                        INTON;
  nometa:
                         *exparg.lastp = str;
                         rmescapes(str->text, 0, NULL);
@@ -8666,7 +8666,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                         break;
                 default:        /* GLOB_NOSPACE */
                         globfree(&pglob);
-                        INT_ON;
+                        INTON;
                         ash_msg_and_raise_error(bb_msg_memory_exhausted);
                 }
                 str = str->next;
@@ -8926,7 +8926,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                         goto nometa;
                 savelastp = exparg.lastp;
 
-                INT_OFF;
+                INTOFF;
                 p = preglob(str->text, RMESCAPE_ALLOC | RMESCAPE_HEAP);
                 len = strlen(p);
                 exp.dir_max = len + PATH_MAX;
@@ -8936,7 +8936,7 @@ expandmeta(struct strlist *str /*, int flag*/)
                 free(exp.dir);
                 if (p != str->text)
                         free(p);
-                INT_ON;
+                INTON;
                 if (exparg.lastp == savelastp) {
                         /*
                          * no matches
@@ -9369,7 +9369,7 @@ clearcmdentry(void)
         struct tblentry **pp;
         struct tblentry *cmdp;
 
-        INT_OFF;
+        INTOFF;
         for (tblp = cmdtable; tblp < &cmdtable[CMDTABLESIZE]; tblp++) {
                 pp = tblp;
                 while ((cmdp = *pp) != NULL) {
@@ -9386,7 +9386,7 @@ clearcmdentry(void)
                         }
                 }
         }
-        INT_ON;
+        INTON;
 }
 
 /*
@@ -9440,13 +9440,13 @@ delete_cmd_entry(void)
 {
         struct tblentry *cmdp;
 
-        INT_OFF;
+        INTOFF;
         cmdp = *lastcmdentry;
         *lastcmdentry = cmdp->next;
         if (cmdp->cmdtype == CMDFUNCTION)
                 freefunc(cmdp->param.func);
         free(cmdp);
-        INT_ON;
+        INTON;
 }
 
 /*
@@ -10314,11 +10314,11 @@ defun(union node *func)
 {
         struct cmdentry entry;
 
-        INT_OFF;
+        INTOFF;
         entry.cmdtype = CMDFUNCTION;
         entry.u.func = copyfunc(func);
         addcmdentry(func->ndefun.text, &entry);
-        INT_ON;
+        INTON;
 }
 
 /* Reasons for skipping commands (see comment on breakcmd routine) */
@@ -10739,7 +10739,7 @@ evalsubshell(union node *n, int flags)
         if (!backgnd && (flags & EV_EXIT) && !may_have_traps)
                 goto nofork;
 #endif
-        INT_OFF;
+        INTOFF;
         if (backgnd == FORK_FG)
                 get_tty_state();
         jp = makejob(1);
@@ -10752,7 +10752,7 @@ evalsubshell(union node *n, int flags)
 #else
         if (forkshell(jp, n, backgnd) == 0) {
                 /* child */
-                INT_ON;
+                INTON;
                 flags |= EV_EXIT;
                 if (backgnd)
                         flags &= ~EV_TESTED;
@@ -10766,7 +10766,7 @@ evalsubshell(union node *n, int flags)
         status = 0;
         if (backgnd == FORK_FG)
                 status = waitforjob(jp);
-        INT_ON;
+        INTON;
         return status;
 }
 
@@ -10855,7 +10855,7 @@ evalpipe(union node *n, int flags)
         for (lp = n->npipe.cmdlist; lp; lp = lp->next)
                 pipelen++;
         flags |= EV_EXIT;
-        INT_OFF;
+        INTOFF;
         if (n->npipe.pipe_backgnd == 0)
                 get_tty_state();
         jp = makejob(pipelen);
@@ -10881,7 +10881,7 @@ evalpipe(union node *n, int flags)
 #else
                 if (forkshell(jp, lp->n, n->npipe.pipe_backgnd) == 0) {
                         /* child */
-                        INT_ON;
+                        INTON;
                         if (pip[1] >= 0) {
                                 close(pip[0]);
                         }
@@ -10909,7 +10909,7 @@ evalpipe(union node *n, int flags)
                 status = waitforjob(jp);
                 TRACE(("evalpipe:  job done exit status %d\n", status));
         }
-        INT_ON;
+        INTON;
 
         return status;
 }
@@ -11013,7 +11013,7 @@ poplocalvars(int keep)
         int var_type;
 #endif
 
-        INT_OFF;
+        INTOFF;
         ll = localvar_stack;
         localvar_stack = ll->next;
 
@@ -11068,7 +11068,7 @@ poplocalvars(int keep)
                 }
                 free(lvp);
         }
-        INT_ON;
+        INTON;
 }
 
 /*
@@ -11084,12 +11084,12 @@ pushlocalvars(int push)
         if (!push)
                 goto out;
 
-        INT_OFF;
+        INTOFF;
         ll = ckzalloc(sizeof(*ll));
         /*ll->lv = NULL; - zalloc did it */
         ll->next = top;
         localvar_stack = ll;
-        INT_ON;
+        INTON;
  out:
         return top;
 }
@@ -11126,13 +11126,13 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         if (e) {
                 goto funcdone;
         }
-        INT_OFF;
+        INTOFF;
         exception_handler = &jmploc;
         shellparam.malloced = 0;
         func->count++;
         funcname = func->n.ndefun.text;
         funcline = func->n.ndefun.linno;
-        INT_ON;
+        INTON;
         shellparam.nparam = argc - 1;
         shellparam.p = argv + 1;
 #if ENABLE_ASH_GETOPTS
@@ -11141,7 +11141,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
 #endif
         evaltree(func->n.ndefun.body, flags & EV_TESTED);
  funcdone:
-        INT_OFF;
+        INTOFF;
         funcname = savefuncname;
         if (savetrap) {
                 if (!trap[NTRAP_ERR])
@@ -11155,7 +11155,7 @@ evalfun(struct funcnode *func, int argc, char **argv, int flags)
         freeparam(&shellparam);
         shellparam = saveparam;
         exception_handler = savehandler;
-        INT_ON;
+        INTON;
         evalskip &= ~(SKIPFUNC | SKIPFUNCDEF);
         return e;
 }
@@ -11174,7 +11174,7 @@ mklocal(char *name, int flags)
         struct var *vp;
         char *eq = strchr(name, '=');
 
-        INT_OFF;
+        INTOFF;
         /* Cater for duplicate "local". Examples:
          * x=0; f() { local x=1; echo $x; local x; echo $x; }; f; echo $x
          * x=0; f() { local x=1; echo $x; local x=2; echo $x; }; f; echo $x
@@ -11225,7 +11225,7 @@ mklocal(char *name, int flags)
         lvp->next = localvar_stack->lv;
         localvar_stack->lv = lvp;
  ret:
-        INT_ON;
+        INTON;
 }
 
 /*
@@ -11783,7 +11783,7 @@ evalcommand(union node *cmd, int flags)
                         char *sv_argv0;
 #endif
 
-                        INT_OFF;
+                        INTOFF;
                         sv_environ = environ;
                         environ = listvars(VEXPORT, VUNSET, varlist.list, /*end:*/ NULL);
                         /*
@@ -11813,7 +11813,7 @@ evalcommand(union node *cmd, int flags)
                          * our signals to SA_RESTART?
                          */
                         /*clearerr(stdout);*/
-                        INT_ON;
+                        INTON;
                         break;
                 }
 #endif
@@ -11826,7 +11826,7 @@ evalcommand(union node *cmd, int flags)
                         /* No, forking off a child is necessary */
                         struct forkshell fs;
 
-                        INT_OFF;
+                        INTOFF;
                         memset(&fs, 0, sizeof(fs));
                         fs.fpid = FS_SHELLEXEC;
                         fs.argv = argv;
@@ -11839,7 +11839,7 @@ evalcommand(union node *cmd, int flags)
 #else
                 if (!(flags & EV_EXIT) || may_have_traps) {
                         /* No, forking off a child is necessary */
-                        INT_OFF;
+                        INTOFF;
                         get_tty_state();
                         jp = makejob(1);
                         if (forkshell(jp, cmd, FORK_FG) != 0) {
@@ -11847,7 +11847,7 @@ evalcommand(union node *cmd, int flags)
                                 break;
                         }
                         /* child */
-                        FORCE_INT_ON;
+                        FORCEINTON;
                         /* fall through to exec'ing external program */
                 }
 #endif
@@ -11872,7 +11872,7 @@ evalcommand(union node *cmd, int flags)
         status = waitforjob(jp);
         if (jp)
                 TRACE(("forked child exited with %d\n", status));
-        FORCE_INT_ON;
+        FORCEINTON;
 
  out:
         if (cmd->ncmd.redirect)
@@ -12009,7 +12009,7 @@ pushstring(char *s, struct alias *ap)
         int len;
 
         len = strlen(s);
-        INT_OFF;
+        INTOFF;
         if (g_parsefile->strpush || g_parsefile->spfree) {
                 sp = ckzalloc(sizeof(*sp));
                 sp->prev = g_parsefile->strpush;
@@ -12033,14 +12033,14 @@ pushstring(char *s, struct alias *ap)
         g_parsefile->left_in_line = len;
         g_parsefile->unget = 0;
         g_parsefile->spfree = NULL;
-        INT_ON;
+        INTON;
 }
 
 static void popstring(void)
 {
         struct strpush *sp = g_parsefile->strpush;
 
-        INT_OFF;
+        INTOFF;
 #if ENABLE_ASH_ALIAS
         if (sp->ap) {
                 if (g_parsefile->next_to_pgetc[-1] == ' '
@@ -12059,7 +12059,7 @@ static void popstring(void)
         memcpy(g_parsefile->lastc, sp->lastc, sizeof(sp->lastc));
         g_parsefile->strpush = sp->prev;
         g_parsefile->spfree = sp;
-        INT_ON;
+        INTON;
 }
 
 #if ENABLE_PLATFORM_MINGW32
@@ -12156,11 +12156,11 @@ preadfd(void)
                  * #(bash 5.0.17 exits after first "T", looks like a bug)
                  */
                 bb_got_signal = 0;
-                INT_OFF; /* no longjmp'ing out of read_line_input please */
+                INTOFF; /* no longjmp'ing out of read_line_input please */
                 nr = read_line_input(line_input_state, cmdedit_prompt, buf, IBUFSIZ);
                 if (bb_got_signal == SIGINT)
                         write(STDOUT_FILENO, "^C\n", 3);
-                INT_ON; /* here non-blocked SIGINT will longjmp */
+                INTON; /* here non-blocked SIGINT will longjmp */
                 if (nr == 0) {
                         /* ^C pressed, "convert" to SIGINT */
 # if !ENABLE_PLATFORM_MINGW32
@@ -12326,7 +12326,7 @@ nlnoprompt(void)
 
 static void freestrings(struct strpush *sp)
 {
-        INT_OFF;
+        INTOFF;
         do {
                 struct strpush *psp;
 #if ENABLE_ASH_ALIAS
@@ -12345,7 +12345,7 @@ static void freestrings(struct strpush *sp)
         } while (sp);
 
         g_parsefile->spfree = NULL;
-        INT_ON;
+        INTON;
 }
 
 static int __pgetc(void)
@@ -12478,7 +12478,7 @@ popfile(void)
         if (pf == &basepf)
                 return;
 
-        INT_OFF;
+        INTOFF;
         if (pf->pf_fd >= 0)
                 close(pf->pf_fd);
         free(pf->buf);
@@ -12490,7 +12490,7 @@ popfile(void)
         }
         g_parsefile = pf->prev;
         free(pf);
-        INT_ON;
+        INTON;
 }
 
 static void
@@ -12553,7 +12553,7 @@ setinputfile(const char *fname, int flags)
 {
         int fd;
 
-        INT_OFF;
+        INTOFF;
         fd = open(fname, O_RDONLY | O_CLOEXEC);
         if (fd < 0) {
                 if (flags & INPUT_NOFILE_OK)
@@ -12568,7 +12568,7 @@ setinputfile(const char *fname, int flags)
 
         setinputfd(fd, flags & INPUT_PUSH_FILE);
  out:
-        INT_ON;
+        INTON;
         return fd;
 }
 
@@ -12578,13 +12578,13 @@ setinputfile(const char *fname, int flags)
 static void
 setinputstring(char *string)
 {
-        INT_OFF;
+        INTOFF;
         pushfile();
         g_parsefile->next_to_pgetc = string;
         g_parsefile->left_in_line = strlen(string);
         g_parsefile->buf = NULL;
         g_parsefile->linno = lineno;
-        INT_ON;
+        INTON;
 }
 
 
@@ -12880,7 +12880,7 @@ shiftcmd(int argc UNUSED_PARAM, char **argv)
                 n = number(argv[1]);
         if (n > shellparam.nparam)
                 return 1;
-        INT_OFF;
+        INTOFF;
         shellparam.nparam -= n;
         for (ap1 = shellparam.p; --n >= 0; ap1++) {
                 if (shellparam.malloced)
@@ -12893,7 +12893,7 @@ shiftcmd(int argc UNUSED_PARAM, char **argv)
         shellparam.optind = 1;
         shellparam.optoff = -1;
 #endif
-        INT_ON;
+        INTON;
         return 0;
 }
 
@@ -12947,7 +12947,7 @@ setcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         if (!argv[1])
                 return showvars(nullstr, 0, VUNSET);
 
-        INT_OFF;
+        INTOFF;
         retval = options(/*login_sh:*/ NULL);
         if (retval == 0) { /* if no parse error... */
                 optschanged();
@@ -12955,7 +12955,7 @@ setcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         setparam(argptr);
                 }
         }
-        INT_ON;
+        INTON;
         return retval;
 }
 
@@ -14957,7 +14957,7 @@ cmdloop(int top)
 
                 setstackmark(&smark);
 #if JOBS || JOBS_WIN32
-                if (doing_jobctl)
+                if (jobctl)
                         showjobs(SHOW_CHANGED|SHOW_STDERR);
 #endif
                 inter = 0;
@@ -15369,11 +15369,11 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
                         entry->u.index = idx;
                         return;
                 }
-                INT_OFF;
+                INTOFF;
                 cmdp = cmdlookup(name, 1);
                 cmdp->cmdtype = CMDNORMAL;
                 cmdp->param.index = idx;
-                INT_ON;
+                INTON;
                 goto success;
         }
 
@@ -15405,11 +15405,11 @@ find_command(char *name, struct cmdentry *entry, int act, const char *path)
                 entry->u.cmd = bcmd;
                 return;
         }
-        INT_OFF;
+        INTOFF;
         cmdp = cmdlookup(name, 1);
         cmdp->cmdtype = CMDBUILTIN;
         cmdp->param.cmd = bcmd;
-        INT_ON;
+        INTON;
  success:
         cmdp->rehash = 0;
         entry->cmdtype = cmdp->cmdtype;
@@ -15471,7 +15471,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         exitcode = 1;
                         goto next;
                 }
-                INT_OFF;
+                INTOFF;
                 if (action) {
                         if (LONE_DASH(action))
                                 action = NULL;
@@ -15508,7 +15508,7 @@ trapcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 if (signo != 0 && signo < NSIG)
                         setsignal(signo);
 #endif
-                INT_ON;
+                INTON;
  next:
                 ap++;
         }
@@ -15821,9 +15821,9 @@ readcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
          * to jump out of it.
          */
  again:
-        INT_OFF;
+        INTOFF;
         r = shell_builtin_read(&params);
-        INT_ON;
+        INTON;
 
 #if !ENABLE_PLATFORM_MINGW32
         if ((uintptr_t)r == 1 && errno == EINTR) {
@@ -15880,10 +15880,10 @@ umaskcmd(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 symbolic_mode = 1;
         }
 
-        INT_OFF;
+        INTOFF;
         mask = umask(0);
         umask(mask);
-        INT_ON;
+        INTON;
 
         if (*argptr == NULL) {
                 if (symbolic_mode) {
@@ -16372,7 +16372,7 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 popstackmark(&smark);
-                FORCE_INT_ON; /* enable interrupts */
+                FORCEINTON; /* enable interrupts */
                 if (s == 1)
                         goto state1;
                 if (s == 2)
@@ -16499,11 +16499,11 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                         if (!hp) {
                                 hp = lookupvar("HOME");
                                 if (hp) {
-                                        INT_OFF;
+                                        INTOFF;
                                         hp = concat_path_file(hp, ".ash_history");
                                         setvar0("HISTFILE", hp);
                                         free((char*)hp);
-                                        INT_ON;
+                                        INTON;
                                         hp = lookupvar("HISTFILE");
                                 }
                         }
@@ -16578,7 +16578,7 @@ forkshell_evalbackcmd(struct forkshell *fs)
         pip[ip] = fs->fd[ip];
         pip[ic] = fs->fd[ic];
 
-        FORCE_INT_ON;
+        FORCEINTON;
         close(pip[ip]);
         if (pip[ic] != ic) {
                 /*close(ic);*/
@@ -16598,7 +16598,7 @@ forkshell_evalsubshell(struct forkshell *fs)
         int flags = fs->flags;
 
         TRACE(("ash: subshell: %s\n",__PRETTY_FUNCTION__));
-        INT_ON;
+        INTON;
         flags |= EV_EXIT;
         if (fs->mode)
                 flags &= ~EV_TESTED;
@@ -16617,7 +16617,7 @@ forkshell_evalpipe(struct forkshell *fs)
         int pip[2] = {fs->fd[0], fs->fd[1]};
 
         TRACE(("ash: subshell: %s\n",__PRETTY_FUNCTION__));
-        INT_ON;
+        INTON;
         if (pip[1] >= 0) {
                 close(pip[0]);
         }
@@ -16639,7 +16639,7 @@ forkshell_shellexec(struct forkshell *fs)
         char **argv = fs->argv;
         char *path = fs->path;
 
-        FORCE_INT_ON;
+        FORCEINTON;
         shellexec(argv[0], argv, path, idx, TRUE);
 }
 
@@ -17607,7 +17607,7 @@ forkshell_init(const char *idstr)
         clear_traps();
 #if JOBS_WIN32
         /* do job control only in root shell */
-        doing_jobctl = 0;
+        jobctl = 0;
 
         if (fs->n && fs->n->type == NCMD && fs->n->ncmd.args &&
                         strcmp(fs->n->ncmd.args->narg.text, "jobs") == 0) {