sh: kill off ELSE

diff --git a/Applications/V7/cmd/sh/args.c b/Applications/V7/cmd/sh/args.c
index b6de50d..afde768 100644 (file)
--- a/Applications/V7/cmd/sh/args.c
+++ b/Applications/V7/cmd/sh/args.c
@@ -49,7 +49,7 @@ INT   options(argc,argv)
                        } else if (*cp=='c' && argc>2 && comdiv==0
                        THEN    comdiv=argp[2];
                                argp[1]=argp[0]; argp++; argc--;
-                       ELSE    failed(argv[1],badopt);
+                       } else {        failed(argv[1],badopt);
                        FI
                OD
                argp[1]=argp[0]; argc--;
@@ -135,6 +135,6 @@ DOLPTR      useargs()
        THEN    dolh->doluse++;
                dolh->dolnxt=argfor;
                return(argfor=dolh);
-       ELSE    return(0);
+       } else {        return(0);
        FI
 }

diff --git a/Applications/V7/cmd/sh/blok.c b/Applications/V7/cmd/sh/blok.c
index cb6b633..82bb0d8 100644 (file)
--- a/Applications/V7/cmd/sh/blok.c
+++ b/Applications/V7/cmd/sh/blok.c
@@ -102,7 +102,7 @@ chkbptr(ptr)
           IF p==bloktop THEN break FI
           IF busy(p)
           THEN us += q-p;
-          ELSE un += q-p;
+          } else { un += q-p;
           FI
           IF p>=q THEN abort(4) FI
           p=q;

diff --git a/Applications/V7/cmd/sh/cmd.c b/Applications/V7/cmd/sh/cmd.c
index 3390c90..3746a85 100644 (file)
--- a/Applications/V7/cmd/sh/cmd.c
+++ b/Applications/V7/cmd/sh/cmd.c
@@ -52,7 +52,7 @@ static TREPTR makelist(type,i,r)
 
        IF i==0 || r==0
        THEN    synbad();
-       ELSE    t = (LSTPTR)getstak(LSTTYPE);
+       } else {        t = (LSTPTR)getstak(LSTTYPE);
                t->lsttyp = type;
                t->lstlef = i; t->lstrit = r;
        FI
@@ -88,7 +88,7 @@ TREPTR        cmd(sym,flg)
            case '&':
                IF i
                THEN    i = makefork(FINT|FPRS|FAMP, i);
-               ELSE    synbad();
+               } else {        synbad();
                FI
 
            case ';':
@@ -143,12 +143,12 @@ static TREPTR     term(flg)
        reserv++;
        IF flg&NLFLG
        THEN    skipnl();
-       ELSE    word();
+       } else {        word();
        FI
 
        IF (t=item(TRUE)) && (wdval=='^' || wdval=='|')
        THEN    return(makelist(TFIL, makefork(FPOU,t), makefork(FPIN|FPCL,term(NLFLG))));
-       ELSE    return(t);
+       } else {        return(t);
        FI
 }
 
@@ -158,7 +158,7 @@ static REGPTR       syncase(esym)
        skipnl();
        IF wdval==esym
        THEN    return(0);
-       ELSE    REG REGPTR      r=(REGPTR)getstak(REGTYPE);
+       } else {        REG REGPTR      r=(REGPTR)getstak(REGTYPE);
                r->regptr=0;
                for(;;) {
                 wdarg->argnxt=r->regptr;
@@ -168,13 +168,13 @@ static REGPTR     syncase(esym)
                     FI
                     IF wdval=='|'
                     THEN word();
-                    ELSE break;
+                    } else { break;
                     FI
                }
                r->regcom=cmd(0,NLFLG|MTFLG);
                IF wdval==ECSYM
                THEN    r->regnxt=syncase(esym);
-               ELSE    chksym(esym);
+               } else {        chksym(esym);
                        r->regnxt=0;
                FI
                return(r);
@@ -200,7 +200,7 @@ static TREPTR       item(flag)
 
        IF flag
        THEN    io=inout((IOPTR)0);
-       ELSE    io=0;
+       } else {        io=0;
        FI
 
        switch(wdval) {
@@ -291,7 +291,7 @@ static TREPTR       item(flag)
                        IF wdset && keywd
                        THEN    argp->argnxt=(ARGPTR)argset;
                                argset=(ARGPTR *)argp;
-                       ELSE    *argtail=argp; argtail = &(argp->argnxt); keywd=flags&keyflg;
+                       } else {        *argtail=argp; argtail = &(argp->argnxt); keywd=flags&keyflg;
                        FI
                        word();
                        IF flag
@@ -347,7 +347,7 @@ static IOPTR        inout(lastio)
                THEN    iof |= IOMOV;
                } else if ( c=='>'
                THEN    iof |= IORDW;
-               ELSE    peekc=c|MARK;
+               } else {        peekc=c|MARK;
                FI
                break;
 
@@ -391,10 +391,10 @@ static void       prsym(sym)
                prs(sp->sysnam);
        } else if ( sym==EOFSYM
        THEN    prs(endoffile);
-       ELSE    IF sym&SYMREP THEN prc(sym) FI
+       } else {        IF sym&SYMREP THEN prc(sym) FI
                IF sym==NL
                THEN    prs("newline");
-               ELSE    prc(sym);
+               } else {        prc(sym);
                FI
        FI
 }
@@ -409,7 +409,7 @@ static void synbad()
        prc(LQ);
        IF wdval
        THEN    prsym(wdval);
-       ELSE    prs(wdarg->argval);
+       } else {        prs(wdarg->argval);
        FI
        prc(RQ); prs(unexpected);
        newline();

diff --git a/Applications/V7/cmd/sh/error.c b/Applications/V7/cmd/sh/error.c
index 9b6bf2b..685b152 100644 (file)
--- a/Applications/V7/cmd/sh/error.c
+++ b/Applications/V7/cmd/sh/error.c
@@ -59,7 +59,8 @@ exitsh(xno)
        exitval=xno;
        IF (flags & (forked|errflg|ttyflg)) != ttyflg
        THEN    done();
-       ELSE    clearup();
+       } else {
+               clearup();
                longjmp(errshell,1);
        FI
 }

diff --git a/Applications/V7/cmd/sh/expand.c b/Applications/V7/cmd/sh/expand.c
index 0536f3a..3e76637 100644 (file)
--- a/Applications/V7/cmd/sh/expand.c
+++ b/Applications/V7/cmd/sh/expand.c
@@ -50,7 +50,7 @@ INT   expand(as,rflg)
           REG BOOL slash; slash=0;
           WHILE !fngchar(*cs)
           DO   IF *cs++==0
-               THEN    IF rflg && slash THEN break; ELSE return(0) FI
+               THEN    IF rflg && slash THEN break; } else { return(0) FI
                } else if ( *cs=='/'
                THEN    slash++;
                FI
@@ -135,7 +135,7 @@ gmatch(s, p)
                        THEN    return(ok?gmatch(s,p):0);
                        } else if ( c==MINUS
                        THEN    IF lc<=scc && scc<=(*p++) THEN ok++ FI
-                       ELSE    IF scc==(lc=(c&STRIP)) THEN ok++ FI
+                       } else {        IF scc==(lc=(c&STRIP)) THEN ok++ FI
                        FI
                OD
                return(0);

diff --git a/Applications/V7/cmd/sh/fault.c b/Applications/V7/cmd/sh/fault.c
index fe5a2f3..021142f 100644 (file)
--- a/Applications/V7/cmd/sh/fault.c
+++ b/Applications/V7/cmd/sh/fault.c
@@ -33,7 +33,7 @@ void  fault(sig)
        THEN    IF flags&waiting
                THEN    done();
                FI
-       ELSE    flag = (trapcom[sig] ? TRAPSET : SIGSET);
+       } else {        flag = (trapcom[sig] ? TRAPSET : SIGSET);
                trapnote |= flag;
                trapflg[sig] |= flag;
        FI

diff --git a/Applications/V7/cmd/sh/io.c b/Applications/V7/cmd/sh/io.c
index ca5a9af..06c0f71 100644 (file)
--- a/Applications/V7/cmd/sh/io.c
+++ b/Applications/V7/cmd/sh/io.c
@@ -54,7 +54,7 @@ pop()
        THEN    IF f->fdes>=0 THEN close(f->fdes) FI
                standin=f->fstak;
                return(TRUE);
-       ELSE    return(FALSE);
+       } else {        return(FALSE);
        FI
 }
 
@@ -73,7 +73,7 @@ chkopen(idf)
 
        IF (rc=open(idf,0))<0
        THEN    failed(idf,badopen);
-       ELSE    return(rc);
+       } else {        return(rc);
        FI
 }
 
@@ -94,7 +94,7 @@ create(s)
 
        IF (rc=creat(s,0666))<0
        THEN    failed(s,badcreate);
-       ELSE    return(rc);
+       } else {        return(rc);
        FI
 }
 

diff --git a/Applications/V7/cmd/sh/mac.h b/Applications/V7/cmd/sh/mac.h
index f302ab0..7d50f04 100644 (file)
--- a/Applications/V7/cmd/sh/mac.h
+++ b/Applications/V7/cmd/sh/mac.h
@@ -16,7 +16,6 @@
 
 #define IF     if(
 #define THEN   ){
-#define ELSE   } else {
 #define FI     ;}
 
 #define FOR    for(

diff --git a/Applications/V7/cmd/sh/macro.c b/Applications/V7/cmd/sh/macro.c
index 6e4ee3f..06537e3 100644 (file)
--- a/Applications/V7/cmd/sh/macro.c
+++ b/Applications/V7/cmd/sh/macro.c
@@ -98,7 +98,7 @@ retry:
                        } else if ( c=='-'
                        THEN    v=flagadr;
                        } else if ( bra THEN error(badsub);
-                       ELSE    goto retry;
+                       } else {        goto retry;
                        FI
                        c = readc();
                        IF !defchar(c) && bra
@@ -110,11 +110,11 @@ retry:
                                THEN    argp=(STRING)relstak();
                                        IF (v==0)^(setchar(c))
                                        THEN    copyto('}');
-                                       ELSE    skipto('}');
+                                       } else {        skipto('}');
                                        FI
                                        argp=absstak(argp);
                                FI
-                       ELSE    peekc = c|MARK; c = 0;
+                       } else {        peekc = c|MARK; c = 0;
                        FI
                        IF v
                        THEN    IF c!='+'
@@ -123,7 +123,7 @@ retry:
                                             DO pushstak(c|quote); OD
                                             IF dolg==0 || (++dolg>dolc)
                                             THEN break;
-                                            ELSE v=dolv[dolg]; pushstak(SP|(*id=='*' ? quote : 0));
+                                            } else { v=dolv[dolg]; pushstak(SP|(*id=='*' ? quote : 0));
                                             FI
                                        }
                                FI
@@ -133,14 +133,14 @@ retry:
                                } else if ( c=='='
                                THEN    IF n
                                        THEN    assign(n,argp);
-                                       ELSE    error(badsub);
+                                       } else {        error(badsub);
                                        FI
                                FI
                        } else if ( flags&setflg
                        THEN    failed(id,badparam);
                        FI
                        goto retry;
-               ELSE    peekc=c|MARK;
+               } else {        peekc=c|MARK;
                FI
        } else if ( d==endch
        THEN    return(d);

diff --git a/Applications/V7/cmd/sh/main.c b/Applications/V7/cmd/sh/main.c
index 58aae6f..7966fd2 100644 (file)
--- a/Applications/V7/cmd/sh/main.c
+++ b/Applications/V7/cmd/sh/main.c
@@ -83,10 +83,10 @@ main(c, v)
                /* open input file if specified */
                IF comdiv
                THEN    estabf(comdiv); input = -1;
-               ELSE    input=((flags&stdflg) ? 0 : chkopen(cmdadr));
+               } else {        input=((flags&stdflg) ? 0 : chkopen(cmdadr));
                        comdiv--;
                FI
-//     ELSE    *execargs=(char *)dolv; /* for `ps' cmd */
+//     } else {        *execargs=(char *)dolv; /* for `ps' cmd */
        FI
 
        exfile(0);
@@ -119,7 +119,8 @@ BOOL                prof;
        THEN    dfault(&ps1nod, (userid?stdprompt:supprompt));
                dfault(&ps2nod, readmsg);
                flags |= ttyflg|prompt; ignsig(KILL);
-       ELSE    flags |= prof; flags &= ~prompt;
+       } else {
+               flags |= prof; flags &= ~prompt;
        FI
 
        IF setjmp(errshell) && prof

diff --git a/Applications/V7/cmd/sh/name.c b/Applications/V7/cmd/sh/name.c
index 59a07df..f715a57 100644 (file)
--- a/Applications/V7/cmd/sh/name.c
+++ b/Applications/V7/cmd/sh/name.c
@@ -59,7 +59,7 @@ setlist(arg,xp)
           arg=arg->argnxt;
           IF flags&execpr
           THEN prs(s);
-               IF arg THEN blank(); ELSE newline(); FI
+               IF arg THEN blank(); } else { newline(); FI
           FI
        OD
 }
@@ -80,7 +80,7 @@ void  setname(argi, xp)
                        attrib(n, xp);
                        IF xp&N_ENVNAM
                        THEN    n->namenv = n->namval = argscan;
-                       ELSE    assign(n, argscan);
+                       } else {        assign(n, argscan);
                        FI
                        return;
                FI
@@ -110,7 +110,7 @@ assign(n,v)
 {
        IF n->namflg&N_RDONLY
        THEN    failed(n->namid,wtfailed);
-       ELSE    replace(&n->namval,v);
+       } else {        replace(&n->namval,v);
        FI
 }
 
@@ -136,17 +136,17 @@ INT       readvar(names)
                        assign(n,absstak(rel)); setstak(rel);
                        IF *names
                        THEN    n=lookup(*names++);
-                       ELSE    n=0;
+                       } else {        n=0;
                        FI
                        IF eolchar(c)
                        THEN    break;
                        FI
-               ELSE    pushstak(c);
+               } else {        pushstak(c);
                FI
        }
        WHILE n
        DO assign(n, nullstr);
-          IF *names THEN n=lookup(*names++); ELSE n=0; FI
+          IF *names THEN n=lookup(*names++); } else { n=0; FI
        OD
 
        IF eof THEN rc=1 FI
@@ -170,7 +170,7 @@ STRING      make(v)
        IF v
        THEN    movstr(v,p=alloc(length(v)));
                return(p);
-       ELSE    return(0);
+       } else {        return(0);
        FI
 }
 
@@ -190,7 +190,7 @@ NAMPTR              lookup(nam)
                THEN    return(nscan);
                } else if ( LR<0
                THEN    prev = &(nscan->namlft);
-               ELSE    prev = &(nscan->namrgt);
+               } else {        prev = &(nscan->namrgt);
                FI
                nscan = *prev;
        OD
@@ -210,7 +210,7 @@ static BOOL chkid(nam)
 
        IF !letter(*cp)
        THEN    return(FALSE);
-       ELSE    WHILE *++cp
+       } else {        WHILE *++cp
                DO IF !alphanum(*cp)
                   THEN return(FALSE);
                   FI
@@ -267,7 +267,7 @@ void        exname(n)
        IF n->namflg&N_EXPORT
        THEN    free(n->namenv);
                n->namenv = make(n->namval);
-       ELSE    free(n->namval);
+       } else {        free(n->namval);
                n->namval = make(n->namenv);
        FI
 }

diff --git a/Applications/V7/cmd/sh/print.c b/Applications/V7/cmd/sh/print.c
index 9126b1b..86bc944 100644 (file)
--- a/Applications/V7/cmd/sh/print.c
+++ b/Applications/V7/cmd/sh/print.c
@@ -93,7 +93,7 @@ STRING        icp;
        DO r = r*10 + c - '0'; cp++ OD
        IF r<0 || cp==icp
        THEN    failed(icp,badnum);
-       ELSE    return(r);
+       } else {        return(r);
        FI
 }
 

diff --git a/Applications/V7/cmd/sh/service.c b/Applications/V7/cmd/sh/service.c
index f4e17c6..a43b725 100644 (file)
--- a/Applications/V7/cmd/sh/service.c
+++ b/Applications/V7/cmd/sh/service.c
@@ -52,7 +52,7 @@ void  initio(iop)
                                        close(iof&IOUFD);
                                } else if ( (fd=stoi(ion))>=USERIO
                                THEN    failed(ion,badfile);
-                               ELSE    fd=dup(fd);
+                               } else {        fd=dup(fd);
                                FI
                        } else if ( (iof&IOPUT)==0
                        THEN    fd=chkopen(ion);
@@ -60,7 +60,7 @@ void  initio(iop)
                        THEN    failed(ion,restricted);
                        } else if ( iof&IOAPP && (fd=open(ion,1))>=0
                        THEN    lseek(fd, 0L, 2);
-                       ELSE    fd=create(ion);
+                       } else {        fd=create(ion);
                        FI
                        IF fd>=0
                        THEN    sh_rename(fd,iof&IOUFD);
@@ -77,11 +77,11 @@ STRING      getpath(s)
        IF any('/',s)
        THEN    IF flags&rshflg
                THEN    failed(s, restricted);
-               ELSE    return(nullstr);
+               } else {        return(nullstr);
                FI
        } else if ( (path = pathnod.namval)==0
        THEN    return(defpath);
-       ELSE    return(cpystak(path));
+       } else {        return(cpystak(path));
        FI
 }
 
@@ -192,7 +192,7 @@ void        post(pcsid)
        THEN    WHILE *pw DO pw++ OD
                IF pwc >= MAXP-1
                THEN    pw--;
-               ELSE    pwc++;
+               } else {        pwc++;
                FI
                *pw = pcsid;
        FI
@@ -217,7 +217,7 @@ void        await(i)
                   WHILE pw <= &pwlist[ipwc]
                   DO IF *pw==p
                      THEN *pw=0; pwc--;
-                     ELSE pw++;
+                     } else { pw++;
                      FI
                   OD
                }
@@ -315,7 +315,7 @@ static void gsort(from,to)
                DO  REG STRING *fromi; fromi = &from[i];
                    IF cf(fromi[m],fromi[0])>0
                    THEN break;
-                   ELSE STRING s; s=fromi[m]; fromi[m]=fromi[0]; fromi[0]=s;
+                   } else { STRING s; s=fromi[m]; fromi[m]=fromi[0]; fromi[0]=s;
                    FI
                OD
            OD
@@ -355,14 +355,14 @@ static INT        split(s)
                IF argp==staktop+BYTESPERWORD
                THEN    IF c
                        THEN    continue;
-                       ELSE    return(count);
+                       } else {        return(count);
                        FI
                } else if (c==0
                THEN    s--;
                FI
                IF c=expand(((ARGPTR)(argp=endstak(argp)))->argval,0)
                THEN    count += c;
-               ELSE    /* assign(&fngnod, argp->argval); */
+               } else {        /* assign(&fngnod, argp->argval); */
                        makearg(argp); count++;
                FI
                Lcheat(gchain) |= ARGMK;

diff --git a/Applications/V7/cmd/sh/word.c b/Applications/V7/cmd/sh/word.c
index fa6dd4e..508bfb3 100644 (file)
--- a/Applications/V7/cmd/sh/word.c
+++ b/Applications/V7/cmd/sh/word.c
@@ -34,7 +34,7 @@ word()
                                WHILE (c=readc()) && c!=LITERAL
                                DO *argp++=(c|QUOTE); chkpr(c) OD
                                *argp++=(DQUOTE);
-                       ELSE    *argp++=(c);
+                       } else {        *argp++=(c);
                                IF c=='=' THEN wdset |= alpha FI
                                IF !alphanum(c) THEN alpha=0 FI
                                IF qotchar(c)
@@ -50,7 +50,7 @@ word()
                peekc=c|MARK;
                IF ((ARGPTR)argp)->argval[1]==0 && (d=((ARGPTR)argp)->argval[0], digit(d)) && (c=='>' || c=='<')
                THEN    word(); wdnum=d-'0';
-               ELSE    /*check for reserved words*/
+               } else {        /*check for reserved words*/
                        IF reserv==FALSE || (wdval=syslook(((ARGPTR)argp)->argval,reserved))==0
                        THEN    wdarg=(ARGPTR)argp; wdval=0;
                        FI
@@ -59,9 +59,9 @@ word()
        } else if ( dipchar(c)
        THEN    IF (d=nextc(0))==c
                THEN    wdval = c|SYMREP;
-               ELSE    peekc = d|MARK; wdval = c;
+               } else {        peekc = d|MARK; wdval = c;
                FI
-       ELSE    IF (wdval=c)==EOF
+       } else {        IF (wdval=c)==EOF
                THEN    wdval=EOFSYM;
                FI
                IF iopend && eolchar(c)
@@ -81,7 +81,7 @@ nextc(quote)
                THEN    chkpr(NL); d=nextc(quote);
                } else if ( quote && c!=quote && !escchar(c)
                THEN    peekc=c|MARK;
-               ELSE    d = c|QUOTE;
+               } else {        d = c|QUOTE;
                FI
        FI
        return(d);
@@ -101,9 +101,9 @@ retry:
                THEN    IF f->feval
                        THEN    IF estabf(*f->feval++)
                                THEN    c=EOF;
-                               ELSE    c=SP;
+                               } else {        c=SP;
                                FI
-                       ELSE    goto retry; /* = c=readc(); */
+                       } else {        goto retry; /* = c=readc(); */
                        FI
                FI
                IF flags&readpr && standin->fstak==0 THEN prc(c) FI
@@ -112,7 +112,7 @@ retry:
        THEN    c=EOF; f->feof++;
        } else if ( (len=readb())<=0
        THEN    close(f->fdes); f->fdes = -1; c=EOF; f->feof++;
-       ELSE    f->fend = (f->fnxt = f->fbuf)+len;
+       } else {        f->fend = (f->fnxt = f->fbuf)+len;
                goto retry;
        FI
        return(c);

diff --git a/Applications/V7/cmd/sh/xec.c b/Applications/V7/cmd/sh/xec.c
index a1cbef8..9cf545c 100644 (file)
--- a/Applications/V7/cmd/sh/xec.c
+++ b/Applications/V7/cmd/sh/xec.c
@@ -74,7 +74,7 @@ execute(argt, execflg, pf1, pf2)
        
                                                IF (f=pathopen(getpath(a1), a1)) < 0
                                                THEN failed(a1,notfound);
-                                               ELSE execexp(0,f);
+                                               } else { execexp(0,f);
                                                FI
                                        FI
                                        break;
@@ -114,14 +114,14 @@ execute(argt, execflg, pf1, pf2)
                                                   THEN failed(*com,badtrap);
                                                   } else if ( clear
                                                   THEN clrsig(i);
-                                                  ELSE replace(&trapcom[i],a1);
+                                                  } else {     replace(&trapcom[i],a1);
                                                        IF *a1
                                                        THEN    getsig(i);
-                                                       ELSE    ignsig(i);
+                                                       } else {        ignsig(i);
                                                        FI
                                                   FI
                                                OD
-                                       ELSE    /* print out current traps */
+                                       } else {        /* print out current traps */
                                                INT             i;
        
                                                FOR i=0; i<MAXTRAP; i++
@@ -152,7 +152,7 @@ execute(argt, execflg, pf1, pf2)
                                case SYSSHFT:
                                        IF dolc<1
                                        THEN    error(badshift);
-                                       ELSE    dolv++; dolc--;
+                                       } else {        dolv++; dolc--;
                                        FI
                                        assnum(&dolladr, dolc);
                                        break;
@@ -192,7 +192,7 @@ execute(argt, execflg, pf1, pf2)
                                        IF a1
                                        THEN    WHILE *++com
                                                DO attrib(lookup(*com), exitval) OD
-                                       ELSE    namscan(printflg);
+                                       } else {        namscan(printflg);
                                        FI
                                        exitval=0;
                                        break;
@@ -239,7 +239,7 @@ execute(argt, execflg, pf1, pf2)
                case TFORK:
                        IF execflg && (treeflgs&(FAMP|FPOU))==0
                        THEN    parent=0;
-                       ELSE    WHILE (parent=fork()) == -1
+                       } else {        WHILE (parent=fork()) == -1
                                DO sigchk(); alarm(10); pause() OD
                        FI
 
@@ -254,14 +254,14 @@ execute(argt, execflg, pf1, pf2)
                                THEN    await(parent);
                                } else if ( (treeflgs&FAMP)==0
                                THEN    post(parent);
-                               ELSE    assnum(&pcsadr, parent);
+                               } else {        assnum(&pcsadr, parent);
                                FI
 
                                chktrap();
                                break;
 
 
-                       ELSE    /* this is the forked branch (child) of execute */
+                       } else {        /* this is the forked branch (child) of execute */
                                flags |= forked; iotemp=0;
                                postclr();
                                settmp();
@@ -310,7 +310,7 @@ execute(argt, execflg, pf1, pf2)
                           INT pv[2]; chkpipe(pv);
                           IF execute(((LSTPTR)t)->lstlef, 0, pf1, pv)==0
                           THEN execute(((LSTPTR)t)->lstrit, execflg, pv, pf2);
-                          ELSE closepipe(pv);
+                          } else {     closepipe(pv);
                           FI
                        }
                        break;
@@ -341,7 +341,7 @@ execute(argt, execflg, pf1, pf2)
                           IF ((FORPTR)t)->forlst==0
                           THEN    args=dolv+1;
                                   argsav=useargs();
-                          ELSE    ARGPTR       schain=gchain;
+                          } else {        ARGPTR       schain=gchain;
                                   gchain=0;
                                   trim((args=scan(getarg(((FORPTR)t)->forlst)))[0]);
                                   gchain=schain;
@@ -376,7 +376,7 @@ execute(argt, execflg, pf1, pf2)
                case TIF:
                        IF execute(((IFPTR)t)->iftre,0)==0
                        THEN    execute(((IFPTR)t)->thtre,execflg);
-                       ELSE    execute(((IFPTR)t)->eltre,execflg);
+                       } else {        execute(((IFPTR)t)->eltre,execflg);
                        FI
                        break;
 
@@ -391,7 +391,7 @@ execute(argt, execflg, pf1, pf2)
                                        IF gmatch(r,s=macro(rex->argval)) || (trim(s), eq(r,s))
                                        THEN    execute(((REGPTR)t)->regcom,0);
                                                t=0; break;
-                                       ELSE    rex=((ARGPTR)rex)->argnxt;
+                                       } else {        rex=((ARGPTR)rex)->argnxt;
                                        FI
                                OD
                                IF t THEN t=(TREPTR)((REGPTR)t)->regnxt FI