home *** CD-ROM | disk | FTP | other *** search
/ Usenet 1994 January / usenetsourcesnewsgroupsinfomagicjanuary1994.iso / sources / unix / volume1 / bourne / part3 < prev    next >
Encoding:
Internet Message Format  |  1986-11-30  |  44.9 KB
  1. Date: Fri, 7 Jun 85 14:00:51 edt
  2. From: Arnold Robbins <gatech!arnold>
  3. Subject: Bourne shell history + tilde + job control + more (Part 3 of 9)
  4. Newsgroups: mod.sources
  5.  
  6. This is part 3 of 9.  It contains the second set of code diffs for the BSD
  7. Bourne shell.
  8.  
  9. Arnold Robbins
  10. arnold@gatech.{UUCP, CSNET}
  11. ------------------- tear here --------------------
  12. :::::::: name.c :::::::
  13. *** ../orig.u/name.c    Wed May 15 17:13:45 1985
  14. --- name.c    Tue Jun  4 14:43:24 1985
  15. ***************
  16. *** 16,21
  17.   PROC BOOL    chkid();
  18.   
  19.   
  20.   NAMNOD    ps2nod    = {    NIL,        NIL,        ps2name},
  21.       fngnod    = {    NIL,        NIL,        fngname},
  22.       pathnod = {    NIL,        NIL,        pathname},
  23.  
  24. --- 16,25 -----
  25.   PROC BOOL    chkid();
  26.   
  27.   
  28. + #if pyr
  29. + NAMNOD    ps2nod    = {    NIL,        &univnod,    ps2name},
  30. +     univnod = {    NIL,        NIL,        univname},
  31. + #else
  32.   NAMNOD    ps2nod    = {    NIL,        NIL,        ps2name},
  33.   #endif
  34.       fngnod    = {    NIL,        NIL,        fngname},
  35. ***************
  36. *** 17,22
  37.   
  38.   
  39.   NAMNOD    ps2nod    = {    NIL,        NIL,        ps2name},
  40.       fngnod    = {    NIL,        NIL,        fngname},
  41.       pathnod = {    NIL,        NIL,        pathname},
  42.       ifsnod    = {    NIL,        NIL,        ifsname},
  43.  
  44. --- 21,27 -----
  45.       univnod = {    NIL,        NIL,        univname},
  46.   #else
  47.   NAMNOD    ps2nod    = {    NIL,        NIL,        ps2name},
  48. + #endif
  49.       fngnod    = {    NIL,        NIL,        fngname},
  50.       pathnod = {    NIL,        NIL,        pathname},
  51.       ifsnod    = {    NIL,        NIL,        ifsname},
  52. ***************
  53. *** 21,28
  54.       pathnod = {    NIL,        NIL,        pathname},
  55.       ifsnod    = {    NIL,        NIL,        ifsname},
  56.       ps1nod    = {    &pathnod,    &ps2nod,    ps1name},
  57. !     homenod = {    &fngnod,    &ifsnod,    homename},
  58. !     mailnod = {    &homenod,    &ps1nod,    mailname};
  59.   
  60.   NAMPTR        namep = &mailnod;
  61.   
  62.  
  63. --- 26,34 -----
  64.       pathnod = {    NIL,        NIL,        pathname},
  65.       ifsnod    = {    NIL,        NIL,        ifsname},
  66.       ps1nod    = {    &pathnod,    &ps2nod,    ps1name},
  67. !     homenod = {    &histfnod,    &ifsnod,    homename},
  68. !     mailnod = {    &homenod,    &ps1nod,    mailname},
  69. !     histfnod = {    &fngnod,    NIL,        histfilename};
  70.   
  71.   NAMPTR        namep = &mailnod;
  72.   
  73. ***************
  74. *** 38,43
  75.       REG SYSPTR    syscan;
  76.   
  77.       syscan=syswds; first = *w;
  78.   
  79.       WHILE s=syscan->sysnam
  80.       DO  IF first == *s
  81.  
  82. --- 44,50 -----
  83.       REG SYSPTR    syscan;
  84.   
  85.       syscan=syswds; first = *w;
  86. +     IF *w == 0 THEN return (0) FI
  87.   
  88.       WHILE s=syscan->sysnam
  89.       DO  IF first == *s
  90. ***************
  91. *** 129,135
  92.       THEN    f->fsiz=1;
  93.       FI
  94.   
  95. !     LOOP    c=nextc(0);
  96.           IF (*names ANDF any(c, ifsnod.namval)) ORF eolchar(c)
  97.           THEN    zerostak();
  98.               assign(n,absstak(rel)); setstak(rel);
  99.  
  100. --- 136,145 -----
  101.       THEN    f->fsiz=1;
  102.       FI
  103.   
  104. ! 
  105. !     /*    strip any leading IFS characters    */
  106. !     WHILE    (any((c=nextc(0)), ifsnod.namval)) ANDF !(eolchar(c)) DONE
  107. !     LOOP
  108.           IF (*names ANDF any(c, ifsnod.namval)) ORF eolchar(c)
  109.           THEN    zerostak();
  110.               assign(n,absstak(rel)); setstak(rel);
  111. ***************
  112. *** 139,144
  113.               FI
  114.               IF eolchar(c)
  115.               THEN    break;
  116.               FI
  117.           ELSE    pushstak(c);
  118.           FI
  119.  
  120. --- 149,157 -----
  121.               FI
  122.               IF eolchar(c)
  123.               THEN    break;
  124. +             ELSE    /* strip imbedded IFS characters */
  125. +                 WHILE (any((c=nextc(0)), ifsnod.namval)) ANDF
  126. +                     !(eolchar(c)) DONE
  127.               FI
  128.           ELSE    pushstak(c);
  129.               c = nextc(0);
  130. ***************
  131. *** 141,146
  132.               THEN    break;
  133.               FI
  134.           ELSE    pushstak(c);
  135.           FI
  136.       POOL
  137.       WHILE n
  138.  
  139. --- 154,166 -----
  140.                       !(eolchar(c)) DONE
  141.               FI
  142.           ELSE    pushstak(c);
  143. +             c = nextc(0);
  144. +             IF eolchar(c)
  145. +             THEN
  146. +                 STKPTR top = staktop;
  147. +                 WHILE any (*(--top), ifsnod.namval) DONE
  148. +                 staktop = top + 1;
  149. +             FI
  150.           FI
  151.       POOL
  152.       WHILE n
  153. :::::::: name.h :::::::
  154. No differences encountered
  155. :::::::: print.c :::::::
  156. *** ../orig.u/print.c    Wed May 15 17:13:45 1985
  157. --- print.c    Mon Jun  3 11:05:42 1985
  158. ***************
  159. *** 15,20
  160.   
  161.   CHAR        numbuf[6];
  162.   
  163.   
  164.   /* printing and io conversion */
  165.   
  166.  
  167. --- 15,27 -----
  168.   
  169.   CHAR        numbuf[6];
  170.   
  171. + #ifndef TAB
  172. + /* emulate buffered i/o in later versions of the shell (sigh) */
  173. + prc_buff(c)
  174. + char c;
  175. + {
  176. +     prc(c);
  177. + }
  178.   
  179.   prs_buff (s)
  180.   char *s;
  181. ***************
  182. *** 16,21
  183.   CHAR        numbuf[6];
  184.   
  185.   
  186.   /* printing and io conversion */
  187.   
  188.   newline()
  189.  
  190. --- 23,45 -----
  191.       prc(c);
  192.   }
  193.   
  194. + prs_buff (s)
  195. + char *s;
  196. + {
  197. +     prs (s);
  198. + }
  199. + 
  200. + prn_buff (n)
  201. + int n;
  202. + {
  203. +     prn (n);
  204. + }
  205. + 
  206. + flushb ()
  207. + {
  208. + }
  209. + #endif
  210. + 
  211.   /* printing and io conversion */
  212.   
  213.   newline()
  214. ***************
  215. *** 99,101
  216.       FI
  217.   }
  218.   
  219.  
  220. --- 123,229 -----
  221.       FI
  222.   }
  223.   
  224. + void
  225. + pr_prompt (str)
  226. + register char *str;
  227. + {
  228. +     for (; *str; str++)
  229. +     {
  230. +         if (*str != '%')
  231. +             prc_buff (*str);
  232. + #ifdef notdef
  233. +         /* BSD does not have pwd built in, sorry */
  234. +         else if (*(str+1) == 'd')
  235. +         {
  236. +             /* current directory */
  237. +             str++;
  238. +             prs_buff (retcwd());
  239. +         }
  240. + #endif
  241. +         else if (*(str+1) == 'e')
  242. +         {
  243. +             /* event count */
  244. +             str++;
  245. +             if ((flags & nohistflg) == 0)
  246. +                 prn_buff (event_count);
  247. +         }
  248. +         else if (*(str+1) == 'h')
  249. +         {
  250. +             /* hostname */
  251. +             static char *cp = 0;
  252. +             static int didhost = FALSE;
  253. +             static int didgt = FALSE;
  254. +             static char buf[257];
  255. + 
  256. +             if (! didhost)
  257. +             {
  258. +                 gethostname (buf, sizeof buf);
  259. +                 didhost = TRUE;
  260. +                 cp = buf;
  261. +             }
  262. + #ifdef GATECH
  263. +             /*
  264. +              * this is to get rid of the dumb gt- convention.
  265. +              * a gt w/out the - is also removed.
  266. +              */
  267. +             if (! didgt)
  268. +             {
  269. +                 didgt = TRUE;
  270. +                 if (cp[0] == 'g' && cp[1] == 't' && cp[2])
  271. +                 {
  272. +                     cp += 2;
  273. +                     if (cp[0] == '-' && cp[1])
  274. +                         cp++;
  275. +                 }
  276. +             }
  277. + #endif
  278. +             prs_buff (cp);
  279. +             str++;
  280. +         }
  281. +         else if (*(str+1) == 'l')
  282. +         {
  283. +             /* login name */
  284. +             static char *cp = 0;
  285. +             static int didname = FALSE;
  286. + 
  287. +             str++;
  288. +             if (! didname)
  289. +             {
  290. +                 cp = username ();
  291. +                 didname = TRUE;
  292. +             }
  293. + 
  294. +             if (cp)
  295. +                 prs_buff (cp);
  296. +         }
  297. +         else if (*(str+1) == 't')
  298. +         {
  299. +             /* current time, HH:MM */
  300. +             long l;
  301. +             char *cp, *ctime ();
  302. + 
  303. +             str++;
  304. +             time (& l);
  305. +             cp = ctime (& l);
  306. +             cp[16] = '\0';
  307. +             cp += 11;
  308. +             prs_buff (cp);
  309. +         }
  310. + #if pyr
  311. +         else if (*(str+1) == 'u')
  312. +         {
  313. +             /* current univeserse */
  314. +             str++;
  315. +             prs_buff (univ_name[cur_univ-1]);
  316. +         }
  317. + #endif
  318. +         else if (*(str+1) == '\0')    /* % was last char in string */
  319. +         {
  320. +             prc_buff (*str);
  321. +             continue;
  322. +         }
  323. +         else
  324. +             prc_buff (*(++str));
  325. +     }
  326. +     flushb();
  327. + }
  328. :::::::: service.c :::::::
  329. *** ../orig.u/service.c    Wed May 15 17:13:46 1985
  330. --- service.c    Tue Jun  4 15:06:44 1985
  331. ***************
  332. *** 12,17
  333.    */
  334.   
  335.   #include    "defs.h"
  336.   
  337.   
  338.   PROC VOID    gsort();
  339.  
  340. --- 12,20 -----
  341.    */
  342.   
  343.   #include    "defs.h"
  344. + #if JOBS
  345. + #include    <sys/wait.h>
  346. + #endif
  347.   
  348.   
  349.   PROC VOID    gsort();
  350. ***************
  351. *** 43,50
  352.           ion=mactrim(iop->ioname);
  353.           IF *ion ANDF (flags&noexec)==0
  354.           THEN    IF iof&IODOC
  355. !             THEN    subst(chkopen(ion),(fd=tmpfil()));
  356. !                 close(fd); fd=chkopen(tmpout); unlink(tmpout);
  357.               ELIF iof&IOMOV
  358.               THEN    IF eq(minus,ion)
  359.                   THEN    fd = -1;
  360.  
  361. --- 46,57 -----
  362.           ion=mactrim(iop->ioname);
  363.           IF *ion ANDF (flags&noexec)==0
  364.           THEN    IF iof&IODOC
  365. !             THEN    TEMPBLK    tb;
  366. !                 subst(chkopen(ion),(fd=tmpfil(&tb)));
  367. !                 poptemp();    /* pushed in tmpfil --
  368. !                            bug fix for problems with
  369. !                            in-line scripts */
  370. !                 fd=chkopen(tmpout); unlink(tmpout);
  371.               ELIF iof&IOMOV
  372.               THEN    IF eq(minus,ion)
  373.                   THEN    fd = -1;
  374. ***************
  375. *** 53,58
  376.                   THEN    failed(ion,badfile);
  377.                   ELSE    fd=dup(fd);
  378.                   FI
  379.               ELIF (iof&IOPUT)==0
  380.               THEN    fd=chkopen(ion);
  381.               ELIF flags&rshflg
  382.  
  383. --- 60,69 -----
  384.                   THEN    failed(ion,badfile);
  385.                   ELSE    fd=dup(fd);
  386.                   FI
  387. +             ELIF iof&IORDW
  388. +             THEN    IF (fd=open(ion, 2)) < 0
  389. +                 THEN    failed(ion, badopen);
  390. +                 FI
  391.               ELIF (iof&IOPUT)==0
  392.               THEN    fd=chkopen(ion);
  393.               ELIF flags&rshflg
  394. ***************
  395. *** 69,74
  396.       FI
  397.   }
  398.   
  399.   STRING    getpath(s)
  400.       STRING        s;
  401.   {
  402.  
  403. --- 80,96 -----
  404.       FI
  405.   }
  406.   
  407. + STRING    simple (s)
  408. +     REG STRING s;
  409. + {
  410. +     STRING save = s;
  411. + 
  412. +     FOR ; *s; s++
  413. +     DO    IF *s == '/' THEN save = s; FI
  414. +     OD
  415. +     return (*save == '/' ? ++save : save);
  416. + }
  417. + 
  418.   STRING    getpath(s)
  419.       STRING        s;
  420.   {
  421. ***************
  422. *** 73,79
  423.       STRING        s;
  424.   {
  425.       REG STRING    path;
  426. !     IF any('/',s)
  427.       THEN    IF flags&rshflg
  428.           THEN    failed(s, restricted);
  429.           ELSE    return(nullstr);
  430.  
  431. --- 95,101 -----
  432.       STRING        s;
  433.   {
  434.       REG STRING    path;
  435. !     IF any('/',s) ORF any(('/'|QUOTE), s)
  436.       THEN    IF flags&rshflg
  437.           THEN    failed(s, restricted);
  438.           ELSE    return(nullstr);
  439. ***************
  440. *** 101,106
  441.       /* leaves result on top of stack */
  442.       REG STRING    scanp = path,
  443.               argp = locstak();
  444.   
  445.       WHILE *scanp ANDF *scanp!=COLON DO *argp++ = *scanp++ OD
  446.       IF scanp!=path THEN *argp++='/' FI
  447.  
  448. --- 123,129 -----
  449.       /* leaves result on top of stack */
  450.       REG STRING    scanp = path,
  451.               argp = locstak();
  452. +     STRING    save = argp, cp;
  453.   
  454.       WHILE *scanp ANDF *scanp!=COLON DO *argp++ = *scanp++ OD
  455.       *argp = '\0';
  456. ***************
  457. *** 103,108
  458.               argp = locstak();
  459.   
  460.       WHILE *scanp ANDF *scanp!=COLON DO *argp++ = *scanp++ OD
  461.       IF scanp!=path THEN *argp++='/' FI
  462.       IF *scanp==COLON THEN scanp++ FI
  463.       path=(*scanp ? scanp : 0); scanp=name;
  464.  
  465. --- 126,137 -----
  466.       STRING    save = argp, cp;
  467.   
  468.       WHILE *scanp ANDF *scanp!=COLON DO *argp++ = *scanp++ OD
  469. +     *argp = '\0';
  470. +     /* try a tilde expansion */
  471. +     IF *save == SQUIGGLE ANDF (cp = homedir(save+1)) != nullstr
  472. +     THEN    movstr(cp, save);
  473. +         argp = save + length (save) - 1;
  474. +     FI
  475.       IF scanp!=path THEN *argp++='/' FI
  476.       IF *scanp==COLON THEN scanp++ FI
  477.       path=(*scanp ? scanp : 0); scanp=name;
  478. ***************
  479. *** 149,165
  480.           close(output); output=2;
  481.           input=chkopen(p);
  482.   
  483. -         /* band aid to get csh... 2/26/79 */
  484. -         {
  485. -             char c;
  486. -             if (!isatty(input)) {
  487. -                 read(input, &c, 1);
  488. -                 if (c == '#')
  489. -                     gocsh(t, p, xecenv);
  490. -                 lseek(input, (long) 0, 0);
  491. -             }
  492. -         }
  493. - 
  494.           /* set up new args */
  495.           setargs(t);
  496.           longjmp(subshell,1);
  497.  
  498. --- 178,183 -----
  499.           close(output); output=2;
  500.           input=chkopen(p);
  501.   
  502.           /* set up new args */
  503.           setargs(t);
  504.           longjmp(subshell,1);
  505. ***************
  506. *** 180,200
  507.       ENDSW
  508.   }
  509.   
  510. - gocsh(t, cp, xecenv)
  511. -     register char **t, *cp, **xecenv;
  512. - {
  513. -     char **newt[1000];
  514. -     register char **p;
  515. -     register int i;
  516. - 
  517. -     for (i = 0; t[i]; i++)
  518. -         newt[i+1] = t[i];
  519. -     newt[i+1] = 0;
  520. -     newt[0] = "/bin/csh";
  521. -     newt[1] = cp;
  522. -     execve("/bin/csh", newt, xecenv);
  523. - }
  524. - 
  525.   /* for processes to be waited for */
  526.   #define MAXP 20
  527.   LOCAL INT    pwlist[MAXP];
  528.  
  529. --- 198,203 -----
  530.       ENDSW
  531.   }
  532.   
  533.   /* for processes to be waited for */
  534.   #define MAXP 20
  535.   LOCAL INT    pwlist[MAXP];
  536. ***************
  537. *** 200,205
  538.   LOCAL INT    pwlist[MAXP];
  539.   LOCAL INT    pwc;
  540.   
  541.   postclr()
  542.   {
  543.       REG INT        *pw = pwlist;
  544.  
  545. --- 203,247 -----
  546.   LOCAL INT    pwlist[MAXP];
  547.   LOCAL INT    pwc;
  548.   
  549. + #if JOBS
  550. + LOCAL INT    *wf_pwlist;
  551. + LOCAL INT    wf_pwc;
  552. + 
  553. + VOID set_wfence()
  554. + {
  555. +     wf_pwlist = &pwlist[pwc];
  556. +     wf_pwc = 0;
  557. + }
  558. + 
  559. + BOOL unpost (pcsid)
  560. +     INT pcsid;
  561. + {
  562. +     REG INT *pw = pwlist;
  563. + 
  564. +     IF pcsid
  565. +     THEN    WHILE pw <= &pwlist[pwc]
  566. +         DO    IF pcsid == *pw
  567. +             THEN
  568. +                 IF pw >= wf_pwlist
  569. +                 THEN    wf_pwc--;    /* DAG -- bug fix */
  570. +                 ELSE    wf_pwlist--;
  571. +                 FI
  572. +                 WHILE pw <= &pwlist[pwc]
  573. +                 DO    *pw = pw[1];
  574. +                     pw++;
  575. +                 OD
  576. +                 pw[pwc] = 0;
  577. +                 pwc--;
  578. +                 return TRUE;
  579. +             FI
  580. +             pw++;
  581. +         OD
  582. +         return FALSE;
  583. +     ELSE    return TRUE;
  584. +     FI
  585. + }
  586. + #endif
  587. + 
  588.   postclr()
  589.   {
  590.       REG INT        *pw = pwlist;
  591. ***************
  592. *** 205,211
  593.       REG INT        *pw = pwlist;
  594.   
  595.       WHILE pw <= &pwlist[pwc]
  596. !     DO *pw++ = 0 OD
  597.       pwc=0;
  598.   }
  599.   
  600.  
  601. --- 247,258 -----
  602.       REG INT        *pw = pwlist;
  603.   
  604.       WHILE pw <= &pwlist[pwc]
  605. !     DO
  606. ! #if JOBS
  607. !         j_child_clear(*pw);
  608. ! #endif
  609. !         *pw++ = 0;
  610. !     OD
  611.       pwc=0;
  612.   }
  613.   
  614. ***************
  615. *** 215,221
  616.       REG INT        *pw = pwlist;
  617.   
  618.       IF pcsid
  619. !     THEN    WHILE *pw DO pw++ OD
  620.           IF pwc >= MAXP-1
  621.           THEN    pw--;
  622.           ELSE    pwc++;
  623.  
  624. --- 262,274 -----
  625.       REG INT        *pw = pwlist;
  626.   
  627.       IF pcsid
  628. !     THEN    WHILE *pw
  629. !         DO
  630. ! #if JOBS
  631. !             IF pcsid == *pw THEN return FI
  632. ! #endif
  633. !             pw++;
  634. !         OD
  635.           IF pwc >= MAXP-1
  636.           THEN    pw--;
  637.           ELSE    pwc++;
  638. ***************
  639. *** 219,224
  640.           IF pwc >= MAXP-1
  641.           THEN    pw--;
  642.           ELSE    pwc++;
  643.           FI
  644.           *pw = pcsid;
  645.       FI
  646.  
  647. --- 272,280 -----
  648.           IF pwc >= MAXP-1
  649.           THEN    pw--;
  650.           ELSE    pwc++;
  651. + #if JOBS
  652. +             wf_pwc++;
  653. + #endif
  654.           FI
  655.           *pw = pcsid;
  656.       FI
  657. ***************
  658. *** 224,231
  659.       FI
  660.   }
  661.   
  662. ! VOID    await(i)
  663. !     INT        i;
  664.   {
  665.       INT        rc=0, wx=0;
  666.       INT        w;
  667.  
  668. --- 280,287 -----
  669.       FI
  670.   }
  671.   
  672. ! VOID    await(i, bckg)
  673. !     INT        i, bckg;
  674.   {
  675.   #if JOBS
  676.   #include <sys/time.h>
  677. ***************
  678. *** 227,232
  679.   VOID    await(i)
  680.       INT        i;
  681.   {
  682.       INT        rc=0, wx=0;
  683.       INT        w;
  684.       INT        ipwc = pwc;
  685.  
  686. --- 283,293 -----
  687.   VOID    await(i, bckg)
  688.       INT        i, bckg;
  689.   {
  690. + #if JOBS
  691. + #include <sys/time.h>
  692. + #include <sys/resource.h>
  693. +     struct rusage    ru;
  694. + #endif
  695.       INT        rc=0, wx=0;
  696.       INT        w;
  697.       INT        ipwc = pwc;
  698. ***************
  699. *** 230,235
  700.       INT        rc=0, wx=0;
  701.       INT        w;
  702.       INT        ipwc = pwc;
  703.   
  704.       post(i);
  705.       WHILE pwc
  706.  
  707. --- 291,298 -----
  708.       INT        rc=0, wx=0;
  709.       INT        w;
  710.       INT        ipwc = pwc;
  711. + #if JOBS
  712. +     BOOL        update_only = i == -2;
  713.   
  714.       IF update_only THEN i = -1 FI
  715.       IF (flags&jobflg) == 0 ORF i != -1
  716. ***************
  717. *** 231,236
  718.       INT        w;
  719.       INT        ipwc = pwc;
  720.   
  721.       post(i);
  722.       WHILE pwc
  723.       DO    REG INT        p;
  724.  
  725. --- 294,303 -----
  726.   #if JOBS
  727.       BOOL        update_only = i == -2;
  728.   
  729. +     IF update_only THEN i = -1 FI
  730. +     IF (flags&jobflg) == 0 ORF i != -1
  731. +     THEN
  732. + #endif
  733.       post(i);
  734.   #if JOBS
  735.       FI
  736. ***************
  737. *** 232,237
  738.       INT        ipwc = pwc;
  739.   
  740.       post(i);
  741.       WHILE pwc
  742.       DO    REG INT        p;
  743.           REG INT        sig;
  744.  
  745. --- 299,308 -----
  746.       THEN
  747.   #endif
  748.       post(i);
  749. + #if JOBS
  750. +     FI
  751. + #endif
  752. + 
  753.       WHILE pwc
  754.   #if JOBS
  755.       ORF (flags&jobflg)
  756. ***************
  757. *** 233,238
  758.   
  759.       post(i);
  760.       WHILE pwc
  761.       DO    REG INT        p;
  762.           REG INT        sig;
  763.           INT        w_hi;
  764.  
  765. --- 304,312 -----
  766.   #endif
  767.   
  768.       WHILE pwc
  769. + #if JOBS
  770. +     ORF (flags&jobflg)
  771. + #endif
  772.       DO    REG INT        p;
  773.           REG INT        sig;
  774.           INT        w_hi;
  775. ***************
  776. *** 236,241
  777.       DO    REG INT        p;
  778.           REG INT        sig;
  779.           INT        w_hi;
  780.   
  781.           BEGIN
  782.              REG INT    *pw=pwlist;
  783.  
  784. --- 310,316 -----
  785.       DO    REG INT        p;
  786.           REG INT        sig;
  787.           INT        w_hi;
  788. +         INT    found = 0;
  789.   
  790.           BEGIN
  791.   #ifndef JOBS
  792. ***************
  793. *** 238,243
  794.           INT        w_hi;
  795.   
  796.           BEGIN
  797.              REG INT    *pw=pwlist;
  798.               IF setjmp(INTbuf) == 0
  799.               THEN    trapjmp[INTR] = 1; p=wait(&w);
  800.  
  801. --- 313,319 -----
  802.           INT    found = 0;
  803.   
  804.           BEGIN
  805. + #ifndef JOBS
  806.              REG INT    *pw=pwlist;
  807.   #else
  808.              IF (i == 0) ANDF (flags & jobflg) ANDF wf_pwc == 0
  809. ***************
  810. *** 239,249
  811.   
  812.           BEGIN
  813.              REG INT    *pw=pwlist;
  814. !             IF setjmp(INTbuf) == 0
  815. !             THEN    trapjmp[INTR] = 1; p=wait(&w);
  816. !             ELSE    p = -1;
  817. !             FI
  818. !             trapjmp[INTR] = 0;
  819.              WHILE pw <= &pwlist[ipwc]
  820.              DO IF *pw==p
  821.                 THEN *pw=0; pwc--;
  822.  
  823. --- 315,346 -----
  824.           BEGIN
  825.   #ifndef JOBS
  826.              REG INT    *pw=pwlist;
  827. ! #else
  828. !            IF (i == 0) ANDF (flags & jobflg) ANDF wf_pwc == 0
  829. !            THEN    break;
  830. !            FI
  831. !            IF (pwc == 0 ANDF (flags&jobflg)) ORF update_only
  832. !            THEN    IF (p = wait3(&w, WUNTRACED|WNOHANG, &ru)) == 0
  833. !             THEN    unpost(i);
  834. !                 break;
  835. !             FI
  836. !             IF pwc == 0 ANDF p == -1 THEN break FI
  837. !            ELSE
  838. ! #endif
  839. !             p = wait3(&w, WUNTRACED, &ru);
  840. ! #if JOBS
  841. !            FI
  842. ! #endif
  843. ! 
  844. !            IF wasintr THEN
  845. !             wasintr = 0;
  846. !             IF bckg THEN
  847. !                 break;
  848. !             FI
  849. !            FI
  850. ! #if JOBS
  851. !            IF unpost(p) THEN found++ FI
  852. ! #else
  853.              WHILE pw <= &pwlist[ipwc]
  854.              DO IF *pw==p
  855.                 THEN *pw=0; pwc--;
  856. ***************
  857. *** 247,252
  858.              WHILE pw <= &pwlist[ipwc]
  859.              DO IF *pw==p
  860.                 THEN *pw=0; pwc--;
  861.                 ELSE pw++;
  862.                 FI
  863.              OD
  864.  
  865. --- 344,350 -----
  866.              WHILE pw <= &pwlist[ipwc]
  867.              DO IF *pw==p
  868.                 THEN *pw=0; pwc--;
  869. +             found++;
  870.                 ELSE pw++;
  871.                 FI
  872.              OD
  873. ***************
  874. *** 250,255
  875.                 ELSE pw++;
  876.                 FI
  877.              OD
  878.           END
  879.   
  880.           IF p == -1 THEN continue FI
  881.  
  882. --- 348,354 -----
  883.                 ELSE pw++;
  884.                 FI
  885.              OD
  886. + #endif
  887.           END
  888.   
  889.           IF p == -1 THEN
  890. ***************
  891. *** 252,258
  892.              OD
  893.           END
  894.   
  895. !         IF p == -1 THEN continue FI
  896.   
  897.           w_hi = (w>>8)&LOBYTE;
  898.   
  899.  
  900. --- 351,370 -----
  901.   #endif
  902.           END
  903.   
  904. !         IF p == -1 THEN
  905. !             IF bckg THEN
  906. ! #if JOBS
  907. !                 j_child_clear(i);
  908. !                 unpost(i);
  909. ! #else
  910. !                 REG INT *pw=pwlist;
  911. !                 WHILE pw <= &pwlist[ipwc] ANDF i != *pw
  912. !                 DO    pw++; OD
  913. !                 IF i == *pw THEN *pw = 0; pwc-- FI
  914. ! #endif
  915. !             FI
  916. !             continue;
  917. !         FI
  918.   
  919.           w_hi = (w>>8)&LOBYTE;
  920.   
  921. ***************
  922. *** 258,265
  923.   
  924.           IF sig = w&0177
  925.           THEN    IF sig == 0177    /* ptrace! return */
  926. !             THEN    prs("ptrace: ");
  927. !                 sig = w_hi;
  928.               FI
  929.               IF sysmsg[sig]
  930.               THEN    IF i!=p ORF (flags&prompt)==0 THEN prp(); prn(p); blank() FI
  931.  
  932. --- 370,384 -----
  933.   
  934.           IF sig = w&0177
  935.           THEN    IF sig == 0177    /* ptrace! return */
  936. !             THEN    sig = w_hi;
  937. ! #if JOBS
  938. !                 IF (flags&jobflg) ANDF
  939. !                 (sig==STOP ORF sig==TSTP ORF sig==TTOU ORF sig==TTIN)
  940. !                 THEN    j_child_stop(p, sig);
  941. !                     goto j_bypass;
  942. !                 FI
  943. ! #endif
  944. !                 prs("ptrace: ");
  945.               FI
  946.               IF sysmsg[sig]
  947.               THEN    IF i!=p ORF (flags&prompt)==0 THEN prp(); prn(p); blank() FI
  948. ***************
  949. *** 269,275
  950.               newline();
  951.           FI
  952.   
  953. !         IF rc==0
  954.           THEN    rc = (sig ? sig|SIGFLG : w_hi);
  955.           FI
  956.           wx |= w;
  957.  
  958. --- 388,425 -----
  959.               newline();
  960.           FI
  961.   
  962. ! #if JOBS
  963. !         IF flags&infoflg
  964. !         THEN
  965. !             register int    k;
  966. !             long        l;
  967. ! 
  968. !             prc('[');
  969. !             l = ru.ru_utime.tv_sec * 1000000L + ru.ru_utime.tv_usec
  970. !               + ru.ru_stime.tv_sec * 1000000L + ru.ru_stime.tv_usec;
  971. !             prn((int)(l / 1000000));    /* integral seconds */
  972. !             k = (int)(l % 1000000L) / 1000;    /* thousandths */
  973. !             prc('.');
  974. !             if (k < 100)
  975. !                 prc('0');
  976. !             if (k < 10)
  977. !                 prc('0');
  978. !             prn(k);
  979. !             blank();
  980. !             prn((int)ru.ru_inblock);
  981. !             blank();
  982. !             prn((int)ru.ru_oublock);
  983. !             blank();
  984. !             prn((int)ru.ru_minflt);
  985. !             blank();
  986. !             prn((int)ru.ru_majflt);
  987. !             prc(']');
  988. !             newline();
  989. !         FI
  990. !         j_child_die(p);
  991. !     j_bypass:
  992. ! #endif
  993. !         IF rc == 0 ANDF found != 0
  994.           THEN    rc = (sig ? sig|SIGFLG : w_hi);
  995.           FI
  996.           wx |= w;
  997. ***************
  998. *** 273,278
  999.           THEN    rc = (sig ? sig|SIGFLG : w_hi);
  1000.           FI
  1001.           wx |= w;
  1002.       OD
  1003.   
  1004.       IF wx ANDF flags&errflg
  1005.  
  1006. --- 423,429 -----
  1007.           THEN    rc = (sig ? sig|SIGFLG : w_hi);
  1008.           FI
  1009.           wx |= w;
  1010. +         IF p == i THEN break FI
  1011.       OD
  1012.   
  1013.       IF wx ANDF flags&errflg
  1014. ***************
  1015. *** 278,283
  1016.       IF wx ANDF flags&errflg
  1017.       THEN    exitsh(rc);
  1018.       FI
  1019.       exitval=rc; exitset();
  1020.   }
  1021.   
  1022.  
  1023. --- 429,435 -----
  1024.       IF wx ANDF flags&errflg
  1025.       THEN    exitsh(rc);
  1026.       FI
  1027. +     flags |= eflag;
  1028.       exitval=rc; exitset();
  1029.   }
  1030.   
  1031. :::::::: setbrk.c :::::::
  1032. No differences encountered
  1033. :::::::: stak.c :::::::
  1034. No differences encountered
  1035. :::::::: stak.h :::::::
  1036. No differences encountered
  1037. :::::::: string.c :::::::
  1038. No differences encountered
  1039. :::::::: sym.h :::::::
  1040. *** ../orig.u/sym.h    Wed May 15 17:13:46 1985
  1041. --- sym.h    Mon Jun  3 12:51:24 1985
  1042. ***************
  1043. *** 46,48
  1044.   #define DOLLAR    '$'
  1045.   #define ESCAPE    '\\'
  1046.   #define BRACE    '{'
  1047.  
  1048. --- 46,51 -----
  1049.   #define DOLLAR    '$'
  1050.   #define ESCAPE    '\\'
  1051.   #define BRACE    '{'
  1052. + #if JOBS
  1053. + #define PERCENT    '%'
  1054. + #endif
  1055. :::::::: timeout.h :::::::
  1056. No differences encountered
  1057. :::::::: word.c :::::::
  1058. *** ../orig.u/word.c    Wed May 15 17:13:46 1985
  1059. --- word.c    Thu Jun  6 14:38:18 1985
  1060. ***************
  1061. *** 23,28
  1062.       REG CHAR    c, d;
  1063.       REG CHAR    *argp=locstak()+BYTESPERWORD;
  1064.       INT        alpha=1;
  1065.   
  1066.       wdnum=0; wdset=0;
  1067.   
  1068.  
  1069. --- 23,29 -----
  1070.       REG CHAR    c, d;
  1071.       REG CHAR    *argp=locstak()+BYTESPERWORD;
  1072.       INT        alpha=1;
  1073. +     STRING        save;
  1074.   
  1075.       wdnum=0; wdset=0;
  1076.   
  1077. ***************
  1078. *** 26,32
  1079.   
  1080.       wdnum=0; wdset=0;
  1081.   
  1082. !     WHILE (c=nextc(0), space(c)) DONE
  1083.   
  1084.       IF c=='#'
  1085.       THEN    WHILE (c=readc()) ANDF c!=NL DONE
  1086.  
  1087. --- 27,43 -----
  1088.   
  1089.       wdnum=0; wdset=0;
  1090.   
  1091. !     catcheof = TRUE;
  1092. !     WHILE TRUE
  1093. !     DO
  1094. !         WHILE (c=nextc(0), space(c)) DONE
  1095. !         IF c=='#'
  1096. !         THEN    WHILE (c=nextc(0)) !=NL ANDF c != EOF DONE
  1097. !             peekc = c;
  1098. !         ELSE    break;    /* out of comment - white space loop */
  1099. !         FI
  1100. !     OD
  1101. !     save = argp;
  1102.   
  1103.       IF !eofmeta(c)
  1104.       THEN    REP    IF c==LITERAL
  1105. ***************
  1106. *** 28,37
  1107.   
  1108.       WHILE (c=nextc(0), space(c)) DONE
  1109.   
  1110. -     IF c=='#'
  1111. -     THEN    WHILE (c=readc()) ANDF c!=NL DONE
  1112. -     FI
  1113. - 
  1114.       IF !eofmeta(c)
  1115.       THEN    REP    IF c==LITERAL
  1116.               THEN    *argp++=(DQUOTE);
  1117.  
  1118. --- 39,44 -----
  1119.       OD
  1120.       save = argp;
  1121.   
  1122.       IF !eofmeta(c)
  1123.       THEN    REP    IF c==LITERAL
  1124.               THEN    *argp++=(DQUOTE);
  1125. ***************
  1126. *** 46,51
  1127.                   THEN    d=c;
  1128.                       WHILE (*argp++=(c=nextc(d))) ANDF c!=d
  1129.                       DO chkpr(c) OD
  1130.                   FI
  1131.               FI
  1132.           PER (c=nextc(0), !eofmeta(c)) DONE
  1133.  
  1134. --- 53,73 -----
  1135.                   THEN    d=c;
  1136.                       WHILE (*argp++=(c=nextc(d))) ANDF c!=d
  1137.                       DO chkpr(c) OD
  1138. +                 ELIF c == SQUIGGLE
  1139. +                 THEN    /* try ~login name */
  1140. +                     STRING name, home;
  1141. + 
  1142. +                     name = argp;
  1143. +                     WHILE (c = nextc(0)) != '/' ANDF
  1144. +                         !eofmeta(c)
  1145. +                     DO
  1146. +                         *name++ = c;
  1147. +                     OD
  1148. +                     peekc = c;
  1149. +                     *name = '\0';
  1150. +                     home = homedir(argp);
  1151. +                     IF *home THEN movstr(home, --argp) FI
  1152. +                     argp += length(argp) - 1;
  1153.                   FI
  1154.               FI
  1155.           PER (c=nextc(0), !eofmeta(c)) DONE
  1156. ***************
  1157. *** 64,69
  1158.       ELIF dipchar(c)
  1159.       THEN    IF (d=nextc(0))==c
  1160.           THEN    wdval = c|SYMREP;
  1161.           ELSE    peekc = d|MARK; wdval = c;
  1162.           FI
  1163.       ELSE    IF (wdval=c)==EOF
  1164.  
  1165. --- 86,97 -----
  1166.       ELIF dipchar(c)
  1167.       THEN    IF (d=nextc(0))==c
  1168.           THEN    wdval = c|SYMREP;
  1169. +             IF c == '<'
  1170. +             THEN    IF (d=nextc(0))=='-'
  1171. +                 THEN stripflg++;
  1172. +                 ELSE peekc = d|MARK;
  1173. +                 FI
  1174. +             FI
  1175.           ELSE    peekc = d|MARK; wdval = c;
  1176.           FI
  1177.       ELSE    IF (wdval=c)==EOF
  1178. ***************
  1179. *** 70,76
  1180.           THEN    wdval=EOFSYM;
  1181.           FI
  1182.           IF iopend ANDF eolchar(c)
  1183. !         THEN    copy(iopend); iopend=0;
  1184.           FI
  1185.       FI
  1186.       reserv=FALSE;
  1187.  
  1188. --- 98,109 -----
  1189.           THEN    wdval=EOFSYM;
  1190.           FI
  1191.           IF iopend ANDF eolchar(c)
  1192. !         THEN    INT histon = (flags&nohistflg) == 0;
  1193. ! 
  1194. !             flags |= nohistflg;    /* no history for here docs */
  1195. !             copy(iopend);
  1196. !             IF histon THEN flags &= ~nohistflg FI    /* restore */
  1197. !             iopend=0;
  1198.           FI
  1199.       FI
  1200.       catcheof = FALSE;
  1201. ***************
  1202. *** 73,78
  1203.           THEN    copy(iopend); iopend=0;
  1204.           FI
  1205.       FI
  1206.       reserv=FALSE;
  1207.       return(wdval);
  1208.   }
  1209.  
  1210. --- 106,112 -----
  1211.               iopend=0;
  1212.           FI
  1213.       FI
  1214. +     catcheof = FALSE;
  1215.       reserv=FALSE;
  1216.       return(wdval);
  1217.   }
  1218. ***************
  1219. *** 94,99
  1220.   
  1221.   readc()
  1222.   {
  1223.       REG CHAR    c;
  1224.       REG INT        len;
  1225.       REG FILE    f;
  1226.  
  1227. --- 128,134 -----
  1228.   
  1229.   readc()
  1230.   {
  1231. +     LOCAL INT    eofcount = 0;    /* to break endless catcheof loop */
  1232.       REG CHAR    c;
  1233.       REG INT        len;
  1234.       REG FILE    f;
  1235. ***************
  1236. *** 116,123
  1237.       ELIF f->feof ORF f->fdes<0
  1238.       THEN    c=EOF; f->feof++;
  1239.       ELIF (len=readb())<=0
  1240. !     THEN    close(f->fdes); f->fdes = -1; c=EOF; f->feof++;
  1241. !     ELSE    f->fend = (f->fnxt = f->fbuf)+len;
  1242.           goto retry;
  1243.       FI
  1244.       return(c);
  1245.  
  1246. --- 151,185 -----
  1247.       ELIF f->feof ORF f->fdes<0
  1248.       THEN    c=EOF; f->feof++;
  1249.       ELIF (len=readb())<=0
  1250. !     THEN
  1251. !         IF catcheof
  1252. ! #if JOBS
  1253. !         ANDF (flags&(ttyflg|prompt|dotflg)) == (ttyflg|prompt)
  1254. !         ANDF ( (flags&noeotflg) ORF j_finish(FALSE) )
  1255. ! #else
  1256. !         ANDF (flags&(ttyflg|prompt|noeotflg|dotflg)) == (ttyflg|prompt|noeotflg)
  1257. ! #endif
  1258. !         ANDF ++eofcount < 10    /* in case terminal is disconnected */
  1259. !         THEN
  1260. ! #if JOBS
  1261. !         IF (flags&(ttyflg|prompt|noeotflg)) == (ttyflg|prompt|noeotflg)
  1262. !         THEN
  1263. ! #endif
  1264. !             prs("use \"exit\"\n");
  1265. ! #if JOBS
  1266. !         /* else "there are stopped jobs" was printed */
  1267. !         FI
  1268. ! #endif
  1269. !         c = NL;
  1270. !         ELSE
  1271. !         close(f->fdes); f->fdes = -1; c=EOF; f->feof++;
  1272. ! #if JOBS
  1273. !         j_finish(TRUE);
  1274. ! #endif
  1275. !         FI
  1276. !     ELSE    f->fend = f->fnxt+len;
  1277. !         /* was f->fend = (f->fnxt = f->fbuf) + len */
  1278. !         eofcount = 0;
  1279.           goto retry;
  1280.       FI
  1281.       return(c);
  1282. ***************
  1283. *** 123,129
  1284.       return(c);
  1285.   }
  1286.   
  1287. ! LOCAL    readb()
  1288.   {
  1289.       REG FILE    f=standin;
  1290.       REG INT        len;
  1291.  
  1292. --- 185,191 -----
  1293.       return(c);
  1294.   }
  1295.   
  1296. ! LOCAL    readblock()    /* ADR --- changed the name */
  1297.   {
  1298.       REG FILE    f=standin;
  1299.       REG INT        len;
  1300. ***************
  1301. *** 128,135
  1302.       REG FILE    f=standin;
  1303.       REG INT        len;
  1304.   
  1305. !     IF setjmp(INTbuf) == 0 THEN trapjmp[INTR] = 1; FI
  1306. !     REP    IF trapnote&SIGSET THEN newline(); sigchk() FI
  1307.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1308.       trapjmp[INTR] = 0;
  1309.       return(len);
  1310.  
  1311. --- 190,201 -----
  1312.       REG FILE    f=standin;
  1313.       REG INT        len;
  1314.   
  1315. !     REP
  1316. !         IF trapnote&SIGSET
  1317. !         THEN    newline(); sigchk();
  1318. !         ELIF (trapnote&TRAPSET) ANDF (rwait>0)
  1319. !         THEN    newline(); chktrap(); clearup();
  1320. !         FI
  1321.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1322.       return(len);
  1323.   }
  1324. ***************
  1325. *** 131,136
  1326.       IF setjmp(INTbuf) == 0 THEN trapjmp[INTR] = 1; FI
  1327.       REP    IF trapnote&SIGSET THEN newline(); sigchk() FI
  1328.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1329. -     trapjmp[INTR] = 0;
  1330.       return(len);
  1331.   }
  1332.  
  1333. --- 197,202 -----
  1334.           THEN    newline(); chktrap(); clearup();
  1335.           FI
  1336.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1337.       return(len);
  1338.   }
  1339.   
  1340. ***************
  1341. *** 133,136
  1342.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1343.       trapjmp[INTR] = 0;
  1344.       return(len);
  1345.   }
  1346.  
  1347. --- 198,398 -----
  1348.           FI
  1349.       PER (len=read(f->fdes,f->fbuf,f->fsiz))<0 ANDF trapnote DONE
  1350.       return(len);
  1351. + }
  1352. + 
  1353. + /* readb --- read a block from the outside world, and history process it */
  1354. + 
  1355. + /*
  1356. +  * In BSD systems, using the literal next capability of the tty driver, it
  1357. +  * is actually possible to put a newline in the middle of the input line,
  1358. +  * and then hit return, so that the shell sees two lines of input.
  1359. +  *
  1360. +  * As a design decision, if there is a \n in the middle of what we've read
  1361. +  * from a terminal, treat the commands as two separately typed commands. I.e.
  1362. +  *
  1363. +  *    echo hi ^J echo there
  1364. +  *
  1365. +  * is the same as
  1366. +  *
  1367. +  *    echo hi
  1368. +  *    echo there
  1369. +  *
  1370. +  * The major reason for doing it this way is that the history mechanism knows
  1371. +  * that a \n is the end of a line.
  1372. +  *
  1373. +  * Finally, on USG systems, we just leave this code alone, since it won't
  1374. +  * get executed anyway.
  1375. +  */
  1376. + 
  1377. + /*
  1378. +  * In word.c, the readc() function keeps a pointer to what standin pointed to
  1379. +  * when readc first gets called.  Therefore, where standin points to can not 
  1380. +  * not change across calls to readb().  To get around this, we change the
  1381. +  * contents of the structure pointed to by standin, saving and restoring
  1382. +  * it as necessary.
  1383. +  */
  1384. + 
  1385. + #define LARGEBUF    (HISTSIZE / 2)    /* size of expanded history */
  1386. + 
  1387. + static
  1388. + readb()
  1389. + {
  1390. +     int ilen, i, j;
  1391. +     char ibuf[BUFSIZ];    /* input into scratch area, pass to history */
  1392. +     static char expansion[LARGEBUF];
  1393. +     static int moreinbuf = FALSE;
  1394. +     static int saved_ilen = 0;
  1395. +     static int start_here = 0;
  1396. +     static struct fileblk *f = 0;
  1397. +     auto int gotoutofbuf = 0;
  1398. + 
  1399. +     if (expanded)    /* just did a history substitution */
  1400. +         expanded = 0;
  1401. + 
  1402. +     if ((flags & nohistflg) || (flags & prompt) == 0 || ! isatty (input)
  1403. +             || standin->fstak != 0)
  1404. +     {
  1405. +         ilen = readblock ();
  1406. +         if (ilen > 0)
  1407. +             standin->fnxt = standin->fbuf;
  1408. +         return (ilen);
  1409. +         /* not doing history expansion at all */
  1410. +     }
  1411. + 
  1412. +     if (f == 0)
  1413. +         f = standin;
  1414. + 
  1415. +     ilen = 0;
  1416. + 
  1417. +     /*
  1418. +      * First, if there was more stuff in the last buffer, go and get it.
  1419. +      * If not get some more from the outside world.
  1420. +      *
  1421. +      * Then, make sure we've read up to a newline.
  1422. +      * This is basically in case someone has done something bizarre
  1423. +      * like 'stty raw', and input is coming in one character at a time.
  1424. +      *
  1425. +      * We use a heuristic.  If amount read is just 1, keep reading till
  1426. +      * we get a newline.  Else, read in a complete line from the terminal.
  1427. +      * Once we're in raw mode, can't reset it until a newline is typed.
  1428. +      *
  1429. +      * If not reading one character at a time, then do the stuff for
  1430. +      * embedded newlines.
  1431. +      */
  1432. + 
  1433. +     if (moreinbuf)
  1434. +     {
  1435. +         for (i = 0, j = start_here; f->fbuf[j] != NL && j < saved_ilen; i++, j++)
  1436. +             ibuf[i] = f->fbuf[j];
  1437. + 
  1438. + #ifdef notdef
  1439. +         if (f->fbuf[j] != NL)
  1440. +         {
  1441. +             prs ("internal i/o error C in readb\n");
  1442. +             return (0);
  1443. +         }
  1444. + #endif
  1445. + 
  1446. +         if (f->fbuf[j] == NL)
  1447. +             ibuf[i++] = NL;
  1448. +         ibuf[i] = '\0';
  1449. +         ilen = i;
  1450. +         /* embedded newline */
  1451. +         moreinbuf = (++j < saved_ilen - 1);
  1452. +         if (moreinbuf)
  1453. +             start_here = j;    /* where to start next time */
  1454. +         gotoutofbuf = 1;
  1455. +     }
  1456. +     else    /* wasn't an embedded \n last time */
  1457. +     {
  1458. +         ilen = readblock ();
  1459. +     
  1460. +         if (ilen <= 0)    /* EOF or error */
  1461. +             return (ilen);
  1462. + 
  1463. +         if (ilen == 1)    /* either in raw mode, or an empty line */
  1464. +         {
  1465. +             i = 0;
  1466. +             ibuf[i++] = f->fbuf[0];
  1467. +             if (f->fbuf[0] == NL)
  1468. +             {
  1469. +                 ibuf[i] = '\0';
  1470. +                 goto dohist;
  1471. +             }
  1472. + 
  1473. +             while ((ilen = readblock()) > 0)
  1474. +             {
  1475. +                 if (ilen != 1)
  1476. +                 {
  1477. +                     prs ("internal i/o error A in readb\n");
  1478. +                     return (0);
  1479. +                 }
  1480. +                 ibuf[i++] = f->fbuf[0];
  1481. +                 if (f->fbuf[0] == NL)
  1482. +                 {
  1483. +                     ibuf[i] = '\0';
  1484. +                     break;    /* while */
  1485. +                 }
  1486. +             }
  1487. +             ilen = i;
  1488. +             gotoutofbuf = TRUE;
  1489. +             /* force code below to use collected string */
  1490. +         }
  1491. +         else
  1492. +         {
  1493. +             /* reading bunches of characters at once */
  1494. +             for (i = 0; f->fbuf[i] != NL && i < ilen; i++)
  1495. +                 ibuf[i] = f->fbuf[i];
  1496. + 
  1497. + #ifdef notdef
  1498. +             if (f->fbuf[i] != NL)
  1499. +             {
  1500. +                 prs ("internal i/o error B in readb\n");
  1501. +                 return (0);
  1502. +             }
  1503. + #endif
  1504. + 
  1505. +             ibuf[i++] = NL;
  1506. +             ibuf[i] = '\0';
  1507. +             /* ilen was set by readblock() */
  1508. +             /* embedded newline */
  1509. +             moreinbuf = (i < ilen - 1);
  1510. +             if (moreinbuf)
  1511. +             {
  1512. +                 saved_ilen = ilen;
  1513. +                 start_here = i;
  1514. +                 /* where to start next time */
  1515. +                 gotoutofbuf = 1;
  1516. +             }
  1517. +         }
  1518. +     }
  1519. + 
  1520. + dohist:
  1521. +     /* quick heuristic */
  1522. +     if (! gotoutofbuf && ilen == 1 && f->fbuf[0] == NL)
  1523. +     {
  1524. +         f->fnxt = f->fbuf;
  1525. +         return (ilen);
  1526. +     }
  1527. + 
  1528. +     if (histsub (ibuf, expansion, sizeof expansion))
  1529. +     {
  1530. +         int olen = length (expansion) - 1;
  1531. +         if (! expanded && ! gotoutofbuf)
  1532. +         {
  1533. +             standin->fnxt = standin->fbuf;
  1534. +             return (ilen);
  1535. +         }
  1536. +         /* else
  1537. +             expanded == TRUE or from buffer */
  1538. +         standin->fnxt = expansion;
  1539. +         return (olen);
  1540. +     }
  1541. +     else
  1542. +     {
  1543. +         /* hist expansion failed, return an empty line */
  1544. +         standin->fnxt = standin->fbuf;
  1545. +         standin->fbuf[0] = NL;
  1546. +         return (1);
  1547. +     }
  1548.   }
  1549. :::::::: xec.c :::::::
  1550. *** ../orig.u/xec.c    Wed May 15 17:13:46 1985
  1551. --- xec.c    Tue Jun  4 17:58:16 1985
  1552. ***************
  1553. *** 12,17
  1554.    */
  1555.   
  1556.   #include    "defs.h"
  1557.   #include    "sym.h"
  1558.   
  1559.   LOCAL INT    parent;
  1560.  
  1561. --- 12,18 -----
  1562.    */
  1563.   
  1564.   #include    "defs.h"
  1565. + #include    <errno.h>
  1566.   #include    "sym.h"
  1567.   
  1568.   LOCAL INT    parent;
  1569. ***************
  1570. *** 23,29
  1571.   /* ========    command execution    ========*/
  1572.   
  1573.   
  1574. ! execute(argt, execflg, pf1, pf2)
  1575.       TREPTR        argt;
  1576.       INT        *pf1, *pf2;
  1577.   {
  1578.  
  1579. --- 24,30 -----
  1580.   /* ========    command execution    ========*/
  1581.   
  1582.   
  1583. ! execute(argt, execflg, errorflg, pf1, pf2)
  1584.       TREPTR        argt;
  1585.       INT        *pf1, *pf2;
  1586.   {
  1587. ***************
  1588. *** 30,35
  1589.       /* `stakbot' is preserved by this routine */
  1590.       REG TREPTR    t;
  1591.       STKPTR        sav=savstak();
  1592.   
  1593.       sigchk();
  1594.   
  1595.  
  1596. --- 31,46 -----
  1597.       /* `stakbot' is preserved by this routine */
  1598.       REG TREPTR    t;
  1599.       STKPTR        sav=savstak();
  1600. + #if pyr
  1601. +     auto INT    change_univ = FALSE;
  1602. +     auto INT    new_univ = 0;
  1603. +     /*
  1604. +      * universes run from 1 to NUMUNIV: We start out at 0
  1605. +      * and increment new_univ in the swtich for internal
  1606. +      * commands, below. new_univ nust *not* be assigned to, directly
  1607. +      * or via side effects, any place else
  1608. +      */
  1609. + #endif
  1610.   
  1611.       sigchk();
  1612.   
  1613. ***************
  1614. *** 33,38
  1615.   
  1616.       sigchk();
  1617.   
  1618.       IF (t=argt) ANDF execbrk==0
  1619.       THEN    REG INT        treeflgs;
  1620.           INT        oldexit, type;
  1621.  
  1622. --- 44,50 -----
  1623.   
  1624.       sigchk();
  1625.   
  1626. +     IF ! errorflg THEN flags &= ~errflg FI
  1627.       IF (t=argt) ANDF execbrk==0
  1628.       THEN    REG INT        treeflgs;
  1629.           INT        oldexit, type;
  1630. ***************
  1631. *** 54,60
  1632.               com=scan(argn);
  1633.               a1=com[1]; gchain=schain;
  1634.   
  1635. !             IF argn==0 ORF (internal=syslook(com[0],commands))
  1636.               THEN    setlist(t->comset, 0);
  1637.               FI
  1638.   
  1639.  
  1640. --- 66,72 -----
  1641.               com=scan(argn);
  1642.               a1=com[1]; gchain=schain;
  1643.   
  1644. !             IF (internal=syslook(com[0],commands)) ORF argn==0
  1645.               THEN    setlist(t->comset, 0);
  1646.               FI
  1647.   
  1648. ***************
  1649. *** 75,81
  1650.       
  1651.                           IF (f=pathopen(getpath(a1), a1)) < 0
  1652.                           THEN failed(a1,notfound);
  1653. !                         ELSE execexp(0,f);
  1654.                           FI
  1655.                       FI
  1656.                       break;
  1657.  
  1658. --- 87,99 -----
  1659.       
  1660.                           IF (f=pathopen(getpath(a1), a1)) < 0
  1661.                           THEN failed(a1,notfound);
  1662. !                         ELSE
  1663. !                             INT savedot = flags&dotflg;
  1664. ! 
  1665. !                             flags |= dotflg;
  1666. !                             execexp(0,f);
  1667. !                             flags &= ~dotflg;
  1668. !                             flags |= savedot;
  1669.                           FI
  1670.                       FI
  1671.                       break;
  1672. ***************
  1673. *** 88,93
  1674.                       break;
  1675.       
  1676.                   case SYSEXIT:
  1677.                       exitsh(a1?stoi(a1):oldexit);
  1678.       
  1679.                   case SYSNULL:
  1680.  
  1681. --- 106,116 -----
  1682.                       break;
  1683.       
  1684.                   case SYSEXIT:
  1685. + #if JOBS
  1686. +                     IF j_finish(FALSE) THEN break; FI
  1687. + #endif
  1688. +                     histsave (histfnod.namval);
  1689. +                     flags |= forked;    /* force exit */
  1690.                       exitsh(a1?stoi(a1):oldexit);
  1691.       
  1692.                   case SYSNULL:
  1693. ***************
  1694. *** 95,101
  1695.                       break;
  1696.       
  1697.                   case SYSCONT:
  1698. !                     execbrk = -loopcnt; break;
  1699.       
  1700.                   case SYSBREAK:
  1701.                       IF (execbrk=loopcnt) ANDF a1
  1702.  
  1703. --- 118,127 -----
  1704.                       break;
  1705.       
  1706.                   case SYSCONT:
  1707. !                     IF (execbrk = -loopcnt) ANDF a1
  1708. !                     THEN    breakcnt = stoi (a1); 
  1709. !                     FI
  1710. !                     break;
  1711.       
  1712.                   case SYSBREAK:
  1713.                       IF (execbrk=loopcnt) ANDF a1
  1714. ***************
  1715. *** 139,144
  1716.                       IF a1==0 THEN break FI
  1717.       
  1718.                   case SYSLOGIN:
  1719.                       flags |= forked;
  1720.                       oldsigs(); execa(com); done();
  1721.       
  1722.  
  1723. --- 165,171 -----
  1724.                       IF a1==0 THEN break FI
  1725.       
  1726.                   case SYSLOGIN:
  1727. +                     histsave (histfnod.namval);
  1728.                       flags |= forked;
  1729.                       oldsigs(); execa(com); done();
  1730.       
  1731. ***************
  1732. *** 151,160
  1733.                       break;
  1734.       
  1735.                   case SYSSHFT:
  1736. !                     IF dolc<1
  1737. !                     THEN    error(badshift);
  1738. !                     ELSE    dolv++; dolc--;
  1739. !                     FI
  1740.                       assnum(&dolladr, dolc);
  1741.                       break;
  1742.       
  1743.  
  1744. --- 178,193 -----
  1745.                       break;
  1746.       
  1747.                   case SYSSHFT:
  1748. !                     BEGIN
  1749. !                         INT places;
  1750. !                         places = a1 ? stoi(a1) : 1;
  1751. !                         FOR ; places--;
  1752. !                         DO    IF dolc<1
  1753. !                             THEN    error(badshift);
  1754. !                             ELSE    dolv++; dolc--;
  1755. !                             FI
  1756. !                         OD
  1757. !                     END
  1758.                       assnum(&dolladr, dolc);
  1759.                       break;
  1760.       
  1761. ***************
  1762. *** 159,164
  1763.                       break;
  1764.       
  1765.                   case SYSWAIT:
  1766.                       await(-1);
  1767.                       break;
  1768.       
  1769.  
  1770. --- 192,198 -----
  1771.                       break;
  1772.       
  1773.                   case SYSWAIT:
  1774. +                     /*
  1775.                       await(-1);
  1776.                       */
  1777.                       await(a1?stoi(a1):-1,1);
  1778. ***************
  1779. *** 160,165
  1780.       
  1781.                   case SYSWAIT:
  1782.                       await(-1);
  1783.                       break;
  1784.       
  1785.                   case SYSREAD:
  1786.  
  1787. --- 194,201 -----
  1788.                   case SYSWAIT:
  1789.                       /*
  1790.                       await(-1);
  1791. +                     */
  1792. +                     await(a1?stoi(a1):-1,1);
  1793.                       break;
  1794.       
  1795.                   case SYSREAD:
  1796. ***************
  1797. *** 163,168
  1798.                       break;
  1799.       
  1800.                   case SYSREAD:
  1801.                       exitval=readvar(&com[1]);
  1802.                       break;
  1803.   
  1804.  
  1805. --- 199,205 -----
  1806.                       break;
  1807.       
  1808.                   case SYSREAD:
  1809. +                     rwait=1;
  1810.                       exitval=readvar(&com[1]);
  1811.                       break;
  1812.   
  1813. ***************
  1814. *** 222,227
  1815.                                           }
  1816.                                           break;
  1817.       
  1818.                   default:
  1819.                       internal=builtin(argn,com);
  1820.       
  1821.  
  1822. --- 259,327 -----
  1823.                                           }
  1824.                                           break;
  1825.       
  1826. + #if JOBS
  1827. +                 case SYSJOBS:
  1828. + 
  1829. +                     j_print();
  1830. +                     break;
  1831. + 
  1832. +                 case SYSFG:
  1833. + 
  1834. +                     j_resume(a1, FALSE);
  1835. +                     break;
  1836. + 
  1837. +                 case SYSBG:
  1838. + 
  1839. +                     j_resume(a1, TRUE);
  1840. +                     break;
  1841. + 
  1842. +                 case SYSSUSPEND:
  1843. +                     exitval = 1;
  1844. +                     IF getppid() == 1
  1845. +                     THEN    prs (nosusp);
  1846. +                     ELSE    exitval = 0;
  1847. +                         kill (getpid(), STOP);
  1848. +                     FI
  1849. +                     break;
  1850. + #endif
  1851. + 
  1852. + #if pyr
  1853. +                 /*
  1854. +                  * UCB is Universe 2
  1855. +                  * ATT is Universe 1
  1856. +                  * new_univ == 0
  1857. +                  */
  1858. +                 case SYSUCB:
  1859. +                     new_univ++;
  1860. +                     /* fall thru */
  1861. +                 case SYSATT:
  1862. +                     new_univ++;
  1863. +                     IF argn > 1
  1864. +                     THEN
  1865. +                         change_univ = TRUE;
  1866. +                         com++;
  1867. +                         goto doit;
  1868. +                     ELSE
  1869. +                         setuniverse (cur_univ = new_univ);
  1870. +                         univnod.namflg &= ~N_RDONLY;
  1871. +                         assign (& univnod, univ_name[cur_univ - 1]);
  1872. +                         attrib ((& univnod), N_RDONLY);
  1873. +                         break;
  1874. +                     FI
  1875. + 
  1876. +                 case SYSUNIVERSE:
  1877. +                     IF eq(com[1], dashl)
  1878. +                     THEN    prs_buff (univ_longname[cur_univ - 1]);
  1879. +                     ELSE    prs_buff (univ_name[cur_univ - 1]);
  1880. +                     FI
  1881. +                     prc_buff (NL);
  1882. +                     break;
  1883. + #endif
  1884. + 
  1885. +                 case SYSHISTORY:
  1886. +                     exitval = history (argn, com);
  1887. +                     break;
  1888. + 
  1889.                   default:
  1890.                       internal=builtin(argn,com);
  1891.       
  1892. ***************
  1893. *** 233,239
  1894.                       break;
  1895.                   FI
  1896.               ELIF t->treio==0
  1897. !             THEN    break;
  1898.               FI
  1899.               END
  1900.       
  1901.  
  1902. --- 333,340 -----
  1903.                       break;
  1904.                   FI
  1905.               ELIF t->treio==0
  1906. !             THEN    chktrap();
  1907. !                 break;
  1908.               FI
  1909.               END
  1910.       
  1911. ***************
  1912. *** 238,243
  1913.               END
  1914.       
  1915.           case TFORK:
  1916.               IF execflg ANDF (treeflgs&(FAMP|FPOU))==0
  1917.               THEN    parent=0;
  1918.               ELSE    WHILE (parent=fork()) == -1
  1919.  
  1920. --- 339,347 -----
  1921.               END
  1922.       
  1923.           case TFORK:
  1924. + #if pyr
  1925. +         doit:
  1926. + #endif
  1927.               IF execflg ANDF (treeflgs&(FAMP|FPOU))==0
  1928.               THEN    parent=0;
  1929.               ELSE    WHILE (parent=fork()) == -1
  1930. ***************
  1931. *** 242,247
  1932.               THEN    parent=0;
  1933.               ELSE    WHILE (parent=fork()) == -1
  1934.                   DO sigchk(); alarm(10); pause() OD
  1935.               FI
  1936.   
  1937.               IF parent
  1938.  
  1939. --- 346,354 -----
  1940.               THEN    parent=0;
  1941.               ELSE    WHILE (parent=fork()) == -1
  1942.                   DO sigchk(); alarm(10); pause() OD
  1943. + #if JOBS
  1944. +                 IF parent == 0 THEN j_top_level = FALSE; FI
  1945. + #endif
  1946.               FI
  1947.   
  1948.               IF parent
  1949. ***************
  1950. *** 248,253
  1951.               THEN    /* This is the parent branch of fork;    */
  1952.                   /* it may or may not wait for the child. */
  1953.                   IF treeflgs&FPRS ANDF flags&ttyflg
  1954.                   THEN    prn(parent); newline();
  1955.                   FI
  1956.                   IF treeflgs&FPCL THEN closepipe(pf1) FI
  1957.  
  1958. --- 355,363 -----
  1959.               THEN    /* This is the parent branch of fork;    */
  1960.                   /* it may or may not wait for the child. */
  1961.                   IF treeflgs&FPRS ANDF flags&ttyflg
  1962. + #if JOBS
  1963. +                 ANDF (flags&jobflg) == 0
  1964. + #endif
  1965.                   THEN    prn(parent); newline();
  1966.                   FI
  1967.                   IF treeflgs&FPCL THEN closepipe(pf1) FI
  1968. ***************
  1969. *** 251,256
  1970.                   THEN    prn(parent); newline();
  1971.                   FI
  1972.                   IF treeflgs&FPCL THEN closepipe(pf1) FI
  1973.                   IF (treeflgs&(FAMP|FPOU))==0
  1974.                   THEN    await(parent);
  1975.                   ELIF (treeflgs&FAMP)==0
  1976.  
  1977. --- 361,369 -----
  1978.                   THEN    prn(parent); newline();
  1979.                   FI
  1980.                   IF treeflgs&FPCL THEN closepipe(pf1) FI
  1981. + #if JOBS
  1982. +                 j_child_post(parent, treeflgs&FAMP, treeflgs&FPIN, t);
  1983. + #endif
  1984.                   IF (treeflgs&(FAMP|FPOU))==0
  1985.                   THEN    await(parent, 0);
  1986.   #if JOBS
  1987. ***************
  1988. *** 252,258
  1989.                   FI
  1990.                   IF treeflgs&FPCL THEN closepipe(pf1) FI
  1991.                   IF (treeflgs&(FAMP|FPOU))==0
  1992. !                 THEN    await(parent);
  1993.                   ELIF (treeflgs&FAMP)==0
  1994.                   THEN    post(parent);
  1995.                   ELSE    assnum(&pcsadr, parent);
  1996.  
  1997. --- 365,374 -----
  1998.                   j_child_post(parent, treeflgs&FAMP, treeflgs&FPIN, t);
  1999.   #endif
  2000.                   IF (treeflgs&(FAMP|FPOU))==0
  2001. !                 THEN    await(parent, 0);
  2002. ! #if JOBS
  2003. !                     j_reset_pg();
  2004. ! #endif
  2005.                   ELIF (treeflgs&FAMP)==0
  2006.                   THEN    post(parent);
  2007.                   ELSE    assnum(&pcsadr, parent);
  2008. ***************
  2009. *** 263,268
  2010.   
  2011.   
  2012.               ELSE    /* this is the forked branch (child) of execute */
  2013.                   flags |= forked; iotemp=0;
  2014.                   postclr();
  2015.                   settmp();
  2016.  
  2017. --- 379,393 -----
  2018.   
  2019.   
  2020.               ELSE    /* this is the forked branch (child) of execute */
  2021. + #if pyr
  2022. +                 IF change_univ
  2023. +                 THEN    setuniverse (new_univ);
  2024. +                     univnod.namflg &= ~N_RDONLY;
  2025. +                     assign (&univnod, univ_name[cur_univ - 1]);
  2026. +                     attrib ((&univnod), N_RDONLY);
  2027. +                 FI
  2028. + #endif
  2029. + 
  2030.                   flags |= forked; iotemp=0;
  2031.                   postclr();
  2032.                   settmp();
  2033. ***************
  2034. *** 268,274
  2035.                   settmp();
  2036.   
  2037.                   /* Turn off INTR and QUIT if `FINT'  */
  2038. !                 /* Reset ramaining signals to parent */
  2039.                   /* except for those `lost' by trap   */
  2040.                   oldsigs();
  2041.                   IF treeflgs&FINT
  2042.  
  2043. --- 393,399 -----
  2044.                   settmp();
  2045.   
  2046.                   /* Turn off INTR and QUIT if `FINT'  */
  2047. !                 /* Reset remaining signals to parent */
  2048.                   /* except for those `lost' by trap   */
  2049.                   oldsigs();
  2050.                   IF treeflgs&FINT
  2051. ***************
  2052. *** 272,277
  2053.                   /* except for those `lost' by trap   */
  2054.                   oldsigs();
  2055.                   IF treeflgs&FINT
  2056.                   THEN    signal(INTR,1); signal(QUIT,1);
  2057.                   FI
  2058.   
  2059.  
  2060. --- 397,405 -----
  2061.                   /* except for those `lost' by trap   */
  2062.                   oldsigs();
  2063.                   IF treeflgs&FINT
  2064. + #if JOBS
  2065. +                 ANDF (flags&jobflg) == 0
  2066. + #endif
  2067.                   THEN    signal(INTR,1); signal(QUIT,1);
  2068.                   FI
  2069.   
  2070. ***************
  2071. *** 287,292
  2072.   
  2073.                   /* default std input for & */
  2074.                   IF treeflgs&FINT ANDF ioset==0
  2075.                   THEN    rename(chkopen(devnull),0);
  2076.                   FI
  2077.   
  2078.  
  2079. --- 415,423 -----
  2080.   
  2081.                   /* default std input for & */
  2082.                   IF treeflgs&FINT ANDF ioset==0
  2083. + #if JOBS
  2084. +                 ANDF (flags&jobflg) == 0
  2085. + #endif
  2086.                   THEN    rename(chkopen(devnull),0);
  2087.                   FI
  2088.   
  2089. ***************
  2090. *** 293,299
  2091.                   /* io redirection */
  2092.                   initio(t->treio);
  2093.                   IF type!=TCOM
  2094. !                 THEN    execute(t->forktre,1);
  2095.                   ELIF com[0]!=ENDARGS
  2096.                   THEN    setlist(t->comset,N_EXPORT);
  2097.                       execa(com);
  2098.  
  2099. --- 424,430 -----
  2100.                   /* io redirection */
  2101.                   initio(t->treio);
  2102.                   IF type!=TCOM
  2103. !                 THEN    execute(t->forktre,1, errorflg);
  2104.                   ELIF com[0]!=ENDARGS
  2105.                   THEN
  2106.                       eflag = 0;
  2107. ***************
  2108. *** 295,301
  2109.                   IF type!=TCOM
  2110.                   THEN    execute(t->forktre,1);
  2111.                   ELIF com[0]!=ENDARGS
  2112. !                 THEN    setlist(t->comset,N_EXPORT);
  2113.                       execa(com);
  2114.                   FI
  2115.                   done();
  2116.  
  2117. --- 426,438 -----
  2118.                   IF type!=TCOM
  2119.                   THEN    execute(t->forktre,1, errorflg);
  2120.                   ELIF com[0]!=ENDARGS
  2121. !                 THEN
  2122. !                     eflag = 0;
  2123. !                     /* eflag must be set to zero so commands
  2124. !                        implemented as shell scripts do not
  2125. !                        exit if set -e and some command in
  2126. !                        the script returns non zero */
  2127. !                     setlist(t->comset,N_EXPORT);
  2128.                       execa(com);
  2129.                   FI
  2130.                   done();
  2131. ***************
  2132. *** 303,309
  2133.   
  2134.           case TPAR:
  2135.               rename(dup(2),output);
  2136. !             execute(t->partre,execflg);
  2137.               done();
  2138.   
  2139.           case TFIL:
  2140.  
  2141. --- 440,446 -----
  2142.   
  2143.           case TPAR:
  2144.               rename(dup(2),output);
  2145. !             execute(t->partre,execflg, errorflg);
  2146.               done();
  2147.   
  2148.           case TFIL:
  2149. ***************
  2150. *** 309,316
  2151.           case TFIL:
  2152.               BEGIN
  2153.                  INT pv[2]; chkpipe(pv);
  2154. !                IF execute(t->lstlef, 0, pf1, pv)==0
  2155. !                THEN    execute(t->lstrit, execflg, pv, pf2);
  2156.                  ELSE    closepipe(pv);
  2157.                  FI
  2158.               END
  2159.  
  2160. --- 446,453 -----
  2161.           case TFIL:
  2162.               BEGIN
  2163.                  INT pv[2]; chkpipe(pv);
  2164. !                IF execute(t->lstlef, 0, errorflg, pf1, pv)==0
  2165. !                THEN    execute(t->lstrit, execflg, errorflg, pv, pf2);
  2166.                  ELSE    closepipe(pv);
  2167.                  FI
  2168.               END
  2169. ***************
  2170. *** 317,324
  2171.               break;
  2172.   
  2173.           case TLST:
  2174. !             execute(t->lstlef,0);
  2175. !             execute(t->lstrit,execflg);
  2176.               break;
  2177.   
  2178.           case TAND:
  2179.  
  2180. --- 454,461 -----
  2181.               break;
  2182.   
  2183.           case TLST:
  2184. !             execute(t->lstlef,0, errorflg);
  2185. !             execute(t->lstrit,execflg, errorflg);
  2186.               break;
  2187.   
  2188.           case TAND:
  2189. ***************
  2190. *** 322,329
  2191.               break;
  2192.   
  2193.           case TAND:
  2194. !             IF execute(t->lstlef,0)==0
  2195. !             THEN    execute(t->lstrit,execflg);
  2196.               FI
  2197.               break;
  2198.   
  2199.  
  2200. --- 459,466 -----
  2201.               break;
  2202.   
  2203.           case TAND:
  2204. !             IF execute(t->lstlef,0, 0)==0
  2205. !             THEN    execute(t->lstrit,execflg, errorflg);
  2206.               FI
  2207.               break;
  2208.   
  2209. ***************
  2210. *** 328,335
  2211.               break;
  2212.   
  2213.           case TORF:
  2214. !             IF execute(t->lstlef,0)!=0
  2215. !             THEN    execute(t->lstrit,execflg);
  2216.               FI
  2217.               break;
  2218.   
  2219.  
  2220. --- 465,472 -----
  2221.               break;
  2222.   
  2223.           case TORF:
  2224. !             IF execute(t->lstlef,0, 0)!=0
  2225. !             THEN    execute(t->lstrit,execflg, errorflg);
  2226.               FI
  2227.               break;
  2228.   
  2229. ***************
  2230. *** 350,357
  2231.                  loopcnt++;
  2232.                  WHILE *args!=ENDARGS ANDF execbrk==0
  2233.                  DO    assign(n,*args++);
  2234. !                 execute(t->fortre,0);
  2235. !                 IF execbrk<0 THEN execbrk=0 FI
  2236.                  OD
  2237.                  IF breakcnt THEN breakcnt-- FI
  2238.                  execbrk=breakcnt; loopcnt--;
  2239.  
  2240. --- 487,499 -----
  2241.                  loopcnt++;
  2242.                  WHILE *args!=ENDARGS ANDF execbrk==0
  2243.                  DO    assign(n,*args++);
  2244. !                 execute(t->fortre,0, errorflg);
  2245. !                 IF execbrk
  2246. !                 THEN    IF breakcnt > 1 ORF execbrk > 0
  2247. !                     THEN break;
  2248. !                     ELSE execbrk = breakcnt = 0;
  2249. !                     FI
  2250. !                 FI
  2251.                  OD
  2252.                  IF breakcnt THEN breakcnt-- FI
  2253.                  execbrk = (execbrk < 0 ? -breakcnt : breakcnt);
  2254. ***************
  2255. *** 354,360
  2256.                   IF execbrk<0 THEN execbrk=0 FI
  2257.                  OD
  2258.                  IF breakcnt THEN breakcnt-- FI
  2259. !                execbrk=breakcnt; loopcnt--;
  2260.                  argfor=freeargs(argsav);
  2261.               END
  2262.               break;
  2263.  
  2264. --- 496,503 -----
  2265.                   FI
  2266.                  OD
  2267.                  IF breakcnt THEN breakcnt-- FI
  2268. !                execbrk = (execbrk < 0 ? -breakcnt : breakcnt);
  2269. !                loopcnt--;
  2270.                  argfor=freeargs(argsav);
  2271.               END
  2272.               break;
  2273. ***************
  2274. *** 365,373
  2275.                  INT        i=0;
  2276.   
  2277.                  loopcnt++;
  2278. !                WHILE execbrk==0 ANDF (execute(t->whtre,0)==0)==(type==TWH)
  2279. !                DO i=execute(t->dotre,0);
  2280. !                   IF execbrk<0 THEN execbrk=0 FI
  2281.                  OD
  2282.                  IF breakcnt THEN breakcnt-- FI
  2283.                  execbrk=breakcnt; loopcnt--; exitval=i;
  2284.  
  2285. --- 508,521 -----
  2286.                  INT        i=0;
  2287.   
  2288.                  loopcnt++;
  2289. !                WHILE execbrk<=0 ANDF (execute(t->whtre,0,0)==0)==(type==TWH)
  2290. !                DO i=execute(t->dotre,0, errorflg);
  2291. !                   IF execbrk
  2292. !                   THEN    IF breakcnt > 1 ORF execbrk > 0
  2293. !                     THEN break;
  2294. !                     ELSE execbrk = breakcnt = 0;
  2295. !                     FI
  2296. !                   FI
  2297.                  OD
  2298.                  IF breakcnt THEN breakcnt-- FI
  2299.                  execbrk=(execbrk < 0 ? -breakcnt : breakcnt);
  2300. ***************
  2301. *** 370,376
  2302.                     IF execbrk<0 THEN execbrk=0 FI
  2303.                  OD
  2304.                  IF breakcnt THEN breakcnt-- FI
  2305. !                execbrk=breakcnt; loopcnt--; exitval=i;
  2306.               END
  2307.               break;
  2308.   
  2309.  
  2310. --- 518,525 -----
  2311.                     FI
  2312.                  OD
  2313.                  IF breakcnt THEN breakcnt-- FI
  2314. !                execbrk=(execbrk < 0 ? -breakcnt : breakcnt);
  2315. !                loopcnt--; exitval=i;
  2316.               END
  2317.               break;
  2318.   
  2319. ***************
  2320. *** 375,383
  2321.               break;
  2322.   
  2323.           case TIF:
  2324. !             IF execute(t->iftre,0)==0
  2325. !             THEN    execute(t->thtre,execflg);
  2326. !             ELSE    execute(t->eltre,execflg);
  2327.               FI
  2328.               break;
  2329.   
  2330.  
  2331. --- 524,534 -----
  2332.               break;
  2333.   
  2334.           case TIF:
  2335. !             IF execute(t->iftre,0,0)==0
  2336. !             THEN    execute(t->thtre,execflg, errorflg);
  2337. !             ELIF    t->eltre
  2338. !             THEN    execute(t->eltre,execflg, errorflg);
  2339. !             ELSE    exitval = 0; /* force zero exit for if-then-fi */
  2340.               FI
  2341.               break;
  2342.   
  2343. ***************
  2344. *** 390,396
  2345.                   WHILE rex
  2346.                   DO    REG STRING    s;
  2347.                       IF gmatch(r,s=macro(rex->argval)) ORF (trim(s), eq(r,s))
  2348. !                     THEN    execute(t->regcom,0);
  2349.                           t=0; break;
  2350.                       ELSE    rex=rex->argnxt;
  2351.                       FI
  2352.  
  2353. --- 541,547 -----
  2354.                   WHILE rex
  2355.                   DO    REG STRING    s;
  2356.                       IF gmatch(r,s=macro(rex->argval)) ORF (trim(s), eq(r,s))
  2357. !                     THEN    execute(t->regcom,0,errorflg);
  2358.                           t=0; break;
  2359.                       ELSE    rex=rex->argnxt;
  2360.                       FI
  2361. ***************
  2362. *** 405,410
  2363.   
  2364.       sigchk();
  2365.       tdystak(sav);
  2366.       return(exitval);
  2367.   }
  2368.   
  2369.  
  2370. --- 556,562 -----
  2371.   
  2372.       sigchk();
  2373.       tdystak(sav);
  2374. +     flags |= eflag;
  2375.       return(exitval);
  2376.   }
  2377.   
  2378. ***************
  2379. *** 420,425
  2380.       ELIF f>=0
  2381.       THEN    initf(f);
  2382.       FI
  2383. !     execute(cmd(NL, NLFLG|MTFLG),0);
  2384.       pop();
  2385.   }
  2386.  
  2387. --- 572,577 -----
  2388.       ELIF f>=0
  2389.       THEN    initf(f);
  2390.       FI
  2391. !     execute(cmd(NL, NLFLG|MTFLG),0, flags&errflg);
  2392.       pop();
  2393.   }
  2394.  
  2395.