sh: kill off INT

diff --git a/Applications/V7/cmd/sh/args.c b/Applications/V7/cmd/sh/args.c
index 7848898..2acc501 100644 (file)
--- a/Applications/V7/cmd/sh/args.c
+++ b/Applications/V7/cmd/sh/args.c
@@ -22,7 +22,7 @@ CHAR flagchar[] = {
        'x', 'n', 'v', 't', 's', 'i', 'e', 'r', 'k', 'u', 0
 };
 
-INT flagval[] = {
+int flagval[] = {
        execpr, noexec, readpr, oneflg, stdflg, intflg, errflg, rshflg,
            keyflg, setflg, 0
 };
@@ -30,9 +30,9 @@ INT flagval[] = {
 /* ========    option handling ======== */
 
 
-INT options(argc, argv)
+int options(argc, argv)
 STRING *argv;
-INT argc;
+int argc;
 {
        register STRING cp;
        register STRING *argp = argv;
@@ -88,7 +88,7 @@ STRING argi[];
 {
        /* count args */
        register STRING *argp = argi;
-       register INT argn = 0;
+       register int argn = 0;
 
        while (Rcheat(*argp++) != ENDARGS) {
                argn++;

diff --git a/Applications/V7/cmd/sh/blok.c b/Applications/V7/cmd/sh/blok.c
index 237186e..e2c820e 100644 (file)
--- a/Applications/V7/cmd/sh/blok.c
+++ b/Applications/V7/cmd/sh/blok.c
@@ -33,7 +33,7 @@ POS nbytes;
        register POS rbytes = round(nbytes + BYTESPERWORD, BYTESPERWORD);
 
        for (;;) {
-               INT c = 0;
+               int c = 0;
                register BLKPTR p = blokp;
                register BLKPTR q;
                do {
@@ -103,10 +103,10 @@ void free(void *ap)
 chkbptr(ptr)
 BLKPTR ptr;
 {
-       INT exf = 0;
+       int exf = 0;
        register BLKPTR p = end;
        register BLKPTR q;
-       INT us = 0, un = 0;
+       int us = 0, un = 0;
 
        for (;;) {
                q = Rcheat(p->word) & ~BUSY;

diff --git a/Applications/V7/cmd/sh/cmd.c b/Applications/V7/cmd/sh/cmd.c
index a31b4ed..96fb52a 100644 (file)
--- a/Applications/V7/cmd/sh/cmd.c
+++ b/Applications/V7/cmd/sh/cmd.c
@@ -32,7 +32,7 @@ static void synbad();
 
 
 TREPTR makefork(flgs, i)
-INT flgs;
+int flgs;
 TREPTR i;
 {
        register FORKPTR t;
@@ -45,7 +45,7 @@ TREPTR i;
 }
 
 static TREPTR makelist(type, i, r)
-INT type;
+int type;
 TREPTR i, r;
 {
        register LSTPTR t;
@@ -71,8 +71,8 @@ TREPTR i, r;
  */
 
 TREPTR cmd(sym, flg)
-register INT sym;
-INT flg;
+register int sym;
+int flg;
 {
        register TREPTR i, e;
 
@@ -133,7 +133,7 @@ INT flg;
 static TREPTR list(flg)
 {
        register TREPTR r;
-       register INT b;
+       register int b;
 
        r = term(flg);
        while (r && ((b = (wdval == ANDFSYM)) || wdval == ORFSYM)
@@ -174,7 +174,7 @@ static TREPTR term(flg)
 }
 
 static REGPTR syncase(esym)
-register INT esym;
+register int esym;
 {
        skipnl();
        if (wdval == esym) {
@@ -251,7 +251,7 @@ BOOL flag;
 
        case IFSYM:
                {
-                       register INT w;
+                       register int w;
                        t = (TREPTR) getstak(IFTYPE);
                        ((IFPTR) t)->iftyp = TIF;
                        ((IFPTR) t)->iftre = cmd(THSYM, NLFLG);
@@ -331,7 +331,7 @@ BOOL flag;
                        register ARGPTR argp;
                        register ARGPTR *argtail;
                        register ARGPTR *argset = 0;
-                       INT keywd = 1;
+                       int keywd = 1;
                        t = (TREPTR) getstak(COMTYPE);
                        ((COMPTR) t)->comio = io;       /*initial io chain */
                        argtail = &(((COMPTR) t)->comarg);
@@ -384,7 +384,7 @@ static int skipnl()
 static IOPTR inout(lastio)
 IOPTR lastio;
 {
-       register INT iof;
+       register int iof;
        register IOPTR iop;
        register CHAR c;
 
@@ -448,7 +448,7 @@ static void chkword()
 
 static void chksym(sym)
 {
-       register INT x = sym & wdval;
+       register int x = sym & wdval;
        if (((x & SYMFLG) ? x : sym) != wdval) {
                synbad();
                ;

diff --git a/Applications/V7/cmd/sh/defs.h b/Applications/V7/cmd/sh/defs.h
index 49ef818..e169f3e 100644 (file)
--- a/Applications/V7/cmd/sh/defs.h
+++ b/Applications/V7/cmd/sh/defs.h
@@ -123,12 +123,12 @@ void prc();
 
 /* temp files and io */
 extern UFD output;
-extern INT ioset;
+extern int ioset;
 extern IOPTR iotemp;           /* files to be deleted sometime */
 extern IOPTR iopend;           /* documents waiting to be read at NL */
 
 /* substitution */
-extern INT dolc;
+extern int dolc;
 extern STRING *dolv;
 extern DOLPTR argfor;
 extern ARGPTR gchain;
@@ -155,10 +155,10 @@ extern const char synmsg[];
 
 /* name tree and words */
 extern SYSTAB reserved;
-extern INT wdval;
-extern INT wdnum;
+extern int wdval;
+extern int wdnum;
 extern ARGPTR wdarg;
-extern INT wdset;
+extern int wdset;
 extern BOOL reserv;
 
 /* prompting */
@@ -197,12 +197,12 @@ extern const char ps2name[];
 /* transput */
 extern CHAR tmpout[];
 extern STRING tmpnam;
-extern INT serial;
+extern int serial;
 #define                TMPNAM 7
 extern FILE standin;
 #define input  (standin->fdes)
 #define eof    (standin->feof)
-extern INT peekc;
+extern int peekc;
 extern STRING comdiv;
 extern const char devnull[];
 
@@ -221,7 +221,7 @@ extern const char devnull[];
 #define                execpr  04000
 #define                readpr  010000
 #define                keyflg  020000
-extern INT flags;
+extern int flags;
 
 /* error exits from various parts of shell */
 #include       <setjmp.h>
@@ -256,10 +256,10 @@ extern const char export[];
 extern const char readonly[];
 
 /* execflgs */
-extern INT exitval;
+extern int exitval;
 extern BOOL execbrk;
-extern INT loopcnt;
-extern INT breakcnt;
+extern int loopcnt;
+extern int breakcnt;
 
 /* messages */
 extern const char mailmsg[];

diff --git a/Applications/V7/cmd/sh/error.c b/Applications/V7/cmd/sh/error.c
index 8627b1b..3f6a528 100644 (file)
--- a/Applications/V7/cmd/sh/error.c
+++ b/Applications/V7/cmd/sh/error.c
@@ -52,7 +52,7 @@ STRING s;
 }
 
 exitsh(xno)
-INT xno;
+int xno;
 {
        /* Arrive here from `FATAL' errors
         *  a) exit command,

diff --git a/Applications/V7/cmd/sh/expand.c b/Applications/V7/cmd/sh/expand.c
index 186fe67..7c5a48c 100644 (file)
--- a/Applications/V7/cmd/sh/expand.c
+++ b/Applications/V7/cmd/sh/expand.c
@@ -30,10 +30,10 @@
 static void addg();
 
 
-INT expand(as, rflg)
+int expand(as, rflg)
 STRING as;
 {
-       INT count, dirf;
+       int count, dirf;
        BOOL dir = 0;
        STRING rescan = 0;
        register STRING s, cs;
@@ -151,7 +151,7 @@ STRING as;
 gmatch(s, p)
 register STRING s, p;
 {
-       register INT scc;
+       register int scc;
        CHAR c;
 
        if (scc = *s++) {
@@ -164,7 +164,7 @@ register STRING s, p;
        case '[':
                {
                        BOOL ok;
-                       INT lc;
+                       int lc;
                        ok = 0;
                        lc = 077777;
                        while (c = *p++) {
@@ -213,7 +213,7 @@ static void addg(as1, as2, as3)
 STRING as1, as2, as3;
 {
        register STRING s1, s2;
-       register INT c;
+       register int c;
 
        s2 = locstak() + BYTESPERWORD;
 

diff --git a/Applications/V7/cmd/sh/fault.c b/Applications/V7/cmd/sh/fault.c
index c1fbaed..b24dd97 100644 (file)
--- a/Applications/V7/cmd/sh/fault.c
+++ b/Applications/V7/cmd/sh/fault.c
@@ -20,9 +20,9 @@ BOOL trapflg[MAXTRAP];
 
 
 void fault(sig)
-register INT sig;
+register int sig;
 {
-       register INT flag;
+       register int flag;
 
        signal(sig, fault);
        if (sig == MEMF) {
@@ -53,7 +53,7 @@ stdsigs()
 
 ignsig(n)
 {
-       register INT s, i;
+       register int s, i;
 #if 0
        // FIXME: need to do proper SIG_IGN checks/handling
        if ((s = signal(i = n, 1) & 01) == 0) {
@@ -66,7 +66,7 @@ ignsig(n)
 
 getsig(n)
 {
-       register INT i;
+       register int i;
 
        if (trapflg[i = n] & SIGMOD || ignsig(i) == 0) {
                signal(i, fault);
@@ -76,7 +76,7 @@ getsig(n)
 
 oldsigs()
 {
-       register INT i;
+       register int i;
        register STRING t;
 
        i = MAXTRAP;
@@ -93,7 +93,7 @@ oldsigs()
 }
 
 clrsig(i)
-INT i;
+int i;
 {
        free(trapcom[i]);
        trapcom[i] = 0;
@@ -107,7 +107,7 @@ INT i;
 chktrap()
 {
        /* check for traps */
-       register INT i = MAXTRAP;
+       register int i = MAXTRAP;
        register STRING t;
 
        trapnote &= ~TRAPSET;
@@ -116,7 +116,7 @@ chktrap()
                        trapflg[i] &= ~TRAPSET;
                        if (t = trapcom[i]
                            ) {
-                               INT savxit = exitval;
+                               int savxit = exitval;
                                execexp(t, 0);
                                exitval = savxit;
                                exitset();

diff --git a/Applications/V7/cmd/sh/io.c b/Applications/V7/cmd/sh/io.c
index b5054d8..1a9e811 100644 (file)
--- a/Applications/V7/cmd/sh/io.c
+++ b/Applications/V7/cmd/sh/io.c
@@ -67,7 +67,7 @@ pop()
 }
 
 chkpipe(pv)
-INT *pv;
+int *pv;
 {
        if (pipe(pv) < 0 || pv[INPIPE] < 0 || pv[OTPIPE] < 0) {
                error(piperr);
@@ -78,7 +78,7 @@ INT *pv;
 chkopen(idf)
 STRING idf;
 {
-       register INT rc;
+       register int rc;
 
        if ((rc = open(idf, 0)) < 0) {
                failed(idf, badopen);
@@ -89,7 +89,7 @@ STRING idf;
 }
 
 sh_rename(f1, f2)
-register INT f1, f2;
+register int f1, f2;
 {
        if (f1 != f2) {
                dup2(f1, f2);
@@ -103,7 +103,7 @@ register INT f1, f2;
 create(s)
 STRING s;
 {
-       register INT rc;
+       register int rc;
 
        if ((rc = creat(s, 0666)) < 0) {
                failed(s, badcreate);
@@ -128,7 +128,7 @@ IOPTR ioparg;
 {
        CHAR c, *ends;
        register CHAR *cline, *clinep;
-       INT fd;
+       int fd;
        register IOPTR iop;
 
        if (iop = ioparg) {

diff --git a/Applications/V7/cmd/sh/macro.c b/Applications/V7/cmd/sh/macro.c
index a8b5eca..b9f91d6 100644 (file)
--- a/Applications/V7/cmd/sh/macro.c
+++ b/Applications/V7/cmd/sh/macro.c
@@ -77,11 +77,11 @@ CHAR endch;
                ;
        }
        if (d == DOLLAR) {
-               register INT c;
+               register int c;
                if ((c = readc(), dolchar(c))
                    ) {
                        NAMPTR n = (NAMPTR) NIL;
-                       INT dolg = 0;
+                       int dolg = 0;
                        BOOL bra;
                        register STRING argp, v;
                        CHAR idb[2];
@@ -262,7 +262,7 @@ static comsubst()
        {
                register TREPTR t =
                    makefork(FPOU, cmd(EOFSYM, MTFLG | NLFLG));
-               INT pv[2];
+               int pv[2];
 
                /* this is done like this so that the pipe
                 * is open only when needed
@@ -291,11 +291,11 @@ static comsubst()
 #define CPYSIZ 512
 
 subst(in, ot)
-INT in, ot;
+int in, ot;
 {
        register CHAR c;
        FILEBLK fb;
-       register INT count = CPYSIZ;
+       register int count = CPYSIZ;
 
        push(&fb);
        initf(in);

diff --git a/Applications/V7/cmd/sh/main.c b/Applications/V7/cmd/sh/main.c
index 1642cc2..99ed44a 100644 (file)
--- a/Applications/V7/cmd/sh/main.c
+++ b/Applications/V7/cmd/sh/main.c
@@ -32,10 +32,10 @@ static void exfile();
 
 
 main(c, v)
-INT c;
+int c;
 STRING v[];
 {
-       register INT rflag = ttyflg;
+       register int rflag = ttyflg;
 
        /* initialise storage allocation */
        stdsigs();
@@ -108,7 +108,7 @@ static void exfile(prof)
 BOOL prof;
 {
        register L_INT mailtime = 0;
-       register INT userid;
+       register int userid;
        struct stat statb;
 
        /* move input */
@@ -204,7 +204,7 @@ settmp()
 }
 
 Ldup(fa, fb)
-register INT fa, fb;
+register int fa, fb;
 {
        dup2(fa, fb);
        close(fa);

diff --git a/Applications/V7/cmd/sh/mode.h b/Applications/V7/cmd/sh/mode.h
index 47d4253..56e9604 100644 (file)
--- a/Applications/V7/cmd/sh/mode.h
+++ b/Applications/V7/cmd/sh/mode.h
@@ -12,7 +12,6 @@
 typedef char CHAR;
 typedef char BOOL;
 typedef int UFD;
-typedef int INT;
 typedef float REAL;
 typedef void *ADDRESS;
 typedef long int L_INT;
@@ -102,7 +101,7 @@ struct filehdr {
 
 struct sysnod {
        STRING sysnam;
-       INT sysval;
+       int sysval;
 };
 
 typedef struct sysnod SYSNOD;
@@ -111,7 +110,7 @@ typedef struct sysnod SYSTAB[];
 
 /* this node is a proforma for those that follow */
 struct trenod {
-       INT tretyp;
+       int tretyp;
        IOPTR treio;
 };
 
@@ -123,45 +122,45 @@ struct argnod {
 
 struct dolnod {
        DOLPTR dolnxt;
-       INT doluse;
+       int doluse;
        CHAR dolarg[1];
 };
 
 struct forknod {
-       INT forktyp;
+       int forktyp;
        IOPTR forkio;
        TREPTR forktre;
 };
 
 struct comnod {
-       INT comtyp;
+       int comtyp;
        IOPTR comio;
        ARGPTR comarg;
        ARGPTR comset;
 };
 
 struct ifnod {
-       INT iftyp;
+       int iftyp;
        TREPTR iftre;
        TREPTR thtre;
        TREPTR eltre;
 };
 
 struct whnod {
-       INT whtyp;
+       int whtyp;
        TREPTR whtre;
        TREPTR dotre;
 };
 
 struct fornod {
-       INT fortyp;
+       int fortyp;
        TREPTR fortre;
        STRING fornam;
        COMPTR forlst;
 };
 
 struct swnod {
-       INT swtyp;
+       int swtyp;
        STRING swarg;
        REGPTR swlst;
 };
@@ -173,18 +172,18 @@ struct regnod {
 };
 
 struct parnod {
-       INT partyp;
+       int partyp;
        TREPTR partre;
 };
 
 struct lstnod {
-       INT lsttyp;
+       int lsttyp;
        TREPTR lstlef;
        TREPTR lstrit;
 };
 
 struct ionod {
-       INT iofile;
+       int iofile;
        STRING ioname;
        IOPTR ionxt;
        IOPTR iolst;

diff --git a/Applications/V7/cmd/sh/name.c b/Applications/V7/cmd/sh/name.c
index e61ca19..d2520c7 100644 (file)
--- a/Applications/V7/cmd/sh/name.c
+++ b/Applications/V7/cmd/sh/name.c
@@ -54,7 +54,7 @@ SYSTAB syswds;
 
 setlist(arg, xp)
 register ARGPTR arg;
-INT xp;
+int xp;
 {
        while (arg) {
                register STRING s = mactrim(arg->argval);
@@ -74,7 +74,7 @@ INT xp;
 
 void setname(argi, xp)
 STRING argi;
-INT xp;
+int xp;
 {
        register STRING argscan = argi;
        register NAMPTR n;
@@ -131,13 +131,13 @@ STRING v;
        }
 }
 
-INT readvar(names)
+int readvar(names)
 STRING *names;
 {
        FILEBLK fb;
        register FILE f = &fb;
        register CHAR c;
-       register INT rc = 0;
+       register int rc = 0;
        NAMPTR n = lookup(*names++);    /* done now to avoid storage mess */
        STKPTR rel = (STKPTR) relstak();
 
@@ -191,7 +191,7 @@ STRING *names;
 
 assnum(p, i)
 STRING *p;
-INT i;
+int i;
 {
        itos(i);
        replace(p, numbuf);
@@ -217,7 +217,7 @@ register STRING nam;
 {
        register NAMPTR nscan = namep;
        register NAMPTR *prev;
-       INT LR;
+       int LR;
 
        if (!chkid(nam)
            ) {
@@ -356,7 +356,7 @@ void sh_getenv(void)
        }
 }
 
-static INT namec;
+static int namec;
 
 void countnam(n)
 NAMPTR n;

diff --git a/Applications/V7/cmd/sh/name.h b/Applications/V7/cmd/sh/name.h
index 8f27a1f..277061d 100644 (file)
--- a/Applications/V7/cmd/sh/name.h
+++ b/Applications/V7/cmd/sh/name.h
@@ -23,5 +23,5 @@ struct namnod {
        STRING namid;
        STRING namval;
        STRING namenv;
-       INT namflg;
+       int namflg;
 };

diff --git a/Applications/V7/cmd/sh/print.c b/Applications/V7/cmd/sh/print.c
index b5e7095..b1e5c5c 100644 (file)
--- a/Applications/V7/cmd/sh/print.c
+++ b/Applications/V7/cmd/sh/print.c
@@ -58,7 +58,7 @@ CHAR c;
 prt(t)
 L_INT t;
 {
-       register INT hr, min, sec;
+       register int hr, min, sec;
 
        t += 30;
        t /= 60;
@@ -77,7 +77,7 @@ L_INT t;
 }
 
 prn(n)
-INT n;
+int n;
 {
        itos(n);
        prs(numbuf);
@@ -87,7 +87,7 @@ itos(n)
 {
        register char *abuf;
        register POS a, i;
-       INT pr, d;
+       int pr, d;
        abuf = numbuf;
        pr = FALSE;
        a = n;
@@ -106,7 +106,7 @@ stoi(icp)
 STRING icp;
 {
        register CHAR *cp = icp;
-       register INT r = 0;
+       register int r = 0;
        register CHAR c;
 
        while ((c = *cp, digit(c)) && c && r >= 0) {

diff --git a/Applications/V7/cmd/sh/service.c b/Applications/V7/cmd/sh/service.c
index 82e4e40..03da425 100644 (file)
--- a/Applications/V7/cmd/sh/service.c
+++ b/Applications/V7/cmd/sh/service.c
@@ -15,11 +15,11 @@
 
 static STRING execs();
 static void gsort();
-static INT split();
+static int split();
 
 #define ARGMK  01
 
-INT errno;
+int errno;
 STRING sysmsg[];
 
 /* fault handling */
@@ -37,7 +37,7 @@ void initio(iop)
 IOPTR iop;
 {
        register STRING ion;
-       register INT iof, fd;
+       register int iof, fd;
 
        if (iop) {
                iof = iop->iofile;
@@ -99,7 +99,7 @@ STRING s;
        }
 }
 
-INT pathopen(path, name)
+int pathopen(path, name)
 register STRING path, name;
 {
        register UFD f;
@@ -198,12 +198,12 @@ register STRING t[];
 
 /* for processes to be waited for */
 #define MAXP 20
-static INT pwlist[MAXP];
-static INT pwc;
+static int pwlist[MAXP];
+static int pwc;
 
 postclr()
 {
-       register INT *pw = pwlist;
+       register int *pw = pwlist;
 
        while (pw <= &pwlist[pwc]
            ) {
@@ -213,9 +213,9 @@ postclr()
 }
 
 void post(pcsid)
-INT pcsid;
+int pcsid;
 {
-       register INT *pw = pwlist;
+       register int *pw = pwlist;
 
        if (pcsid) {
                while (*pw) {
@@ -233,20 +233,20 @@ INT pcsid;
 }
 
 void await(i)
-INT i;
+int i;
 {
-       INT rc = 0, wx = 0;
-       INT w;
-       INT ipwc = pwc;
+       int rc = 0, wx = 0;
+       int w;
+       int ipwc = pwc;
 
        post(i);
        while (pwc) {
-               register INT p;
-               register INT sig;
-               INT w_hi;
+               register int p;
+               register int sig;
+               int w_hi;
 
                {
-                       register INT *pw = pwlist;
+                       register int *pw = pwlist;
                        p = wait(&w);
                        while (pw <= &pwlist[ipwc]
                            ) {
@@ -334,7 +334,7 @@ STRING s;
 }
 
 STRING *scan(argn)
-INT argn;
+int argn;
 {
        register ARGPTR argp = (ARGPTR) (Rcheat(gchain) & ~ARGMK);
        register STRING *comargn, *comargm;
@@ -364,8 +364,8 @@ INT argn;
 static void gsort(from, to)
 STRING from[], to[];
 {
-       INT k, m, n;
-       register INT i, j;
+       int k, m, n;
+       register int i, j;
 
        if ((n = to - from) <= 1) {
                return;
@@ -398,11 +398,11 @@ STRING from[], to[];
 
 /* Argument list generation */
 
-INT getarg(ac)
+int getarg(ac)
 COMPTR ac;
 {
        register ARGPTR argp;
-       register INT count = 0;
+       register int count = 0;
        register COMPTR c;
 
        if (c = ac) {
@@ -417,12 +417,12 @@ COMPTR ac;
        return (count);
 }
 
-static INT split(s)
+static int split(s)
 register STRING s;
 {
        register STRING argp;
-       register INT c;
-       INT count = 0;
+       register int c;
+       int count = 0;
 
        for (;;) {
                sigchk();

diff --git a/Applications/V7/cmd/sh/stak.c b/Applications/V7/cmd/sh/stak.c
index 9926d37..4d2279e 100644 (file)
--- a/Applications/V7/cmd/sh/stak.c
+++ b/Applications/V7/cmd/sh/stak.c
@@ -19,10 +19,10 @@ STKPTR stakbot = nullstr;
 /* ========    storage allocation      ======== */
 
 STKPTR getstak(asize)
-INT asize;
+int asize;
 {                              /* allocate requested stack */
        register STKPTR oldstak;
-       register INT size;
+       register int size;
 
        size = round(asize, BYTESPERWORD);
        oldstak = stakbot;

diff --git a/Applications/V7/cmd/sh/string.c b/Applications/V7/cmd/sh/string.c
index 691eb04..58b2c6a 100644 (file)
--- a/Applications/V7/cmd/sh/string.c
+++ b/Applications/V7/cmd/sh/string.c
@@ -22,7 +22,7 @@ register STRING a, b;
        return (--b);
 }
 
-INT any(c, s)
+int any(c, s)
 register CHAR c;
 STRING s;
 {
@@ -37,7 +37,7 @@ STRING s;
        return (FALSE);
 }
 
-INT cf(s1, s2)
+int cf(s1, s2)
 register STRING s1, s2;
 {
        while (*s1++ == *s2) {
@@ -49,7 +49,7 @@ register STRING s1, s2;
        return (*--s1 - *s2);
 }
 
-INT length(as)
+int length(as)
 STRING as;
 {
        register STRING s;

diff --git a/Applications/V7/cmd/sh/word.c b/Applications/V7/cmd/sh/word.c
index 40de5bd..be8d2c2 100644 (file)
--- a/Applications/V7/cmd/sh/word.c
+++ b/Applications/V7/cmd/sh/word.c
@@ -23,7 +23,7 @@ word()
 {
        register CHAR c, d;
        register CHAR *argp = locstak() + BYTESPERWORD;
-       INT alpha = 1;
+       int alpha = 1;
 
        wdnum = 0;
        wdset = 0;
@@ -129,7 +129,7 @@ CHAR quote;
 readc()
 {
        register CHAR c;
-       register INT len;
+       register int len;
        register FILE f;
 
       retry:
@@ -178,7 +178,7 @@ readc()
 static readb()
 {
        register FILE f = standin;
-       register INT len;
+       register int len;
 
        do {
                if (trapnote & SIGSET) {

diff --git a/Applications/V7/cmd/sh/xec.c b/Applications/V7/cmd/sh/xec.c
index c50fd88..30ed9df 100644 (file)
--- a/Applications/V7/cmd/sh/xec.c
+++ b/Applications/V7/cmd/sh/xec.c
@@ -13,7 +13,7 @@
 #include       "defs.h"
 #include       "sym.h"
 
-static INT parent;
+static int parent;
 
 extern SYSTAB commands;
 
@@ -24,7 +24,7 @@ extern SYSTAB commands;
 
 execute(argt, execflg, pf1, pf2)
 TREPTR argt;
-INT *pf1, *pf2;
+int *pf1, *pf2;
 {
        /* `stakbot' is preserved by this routine */
        register TREPTR t;
@@ -33,8 +33,8 @@ INT *pf1, *pf2;
        sigchk();
 
        if ((t = argt) && execbrk == 0) {
-               register INT treeflgs;
-               INT oldexit, type;
+               register int treeflgs;
+               int oldexit, type;
                register STRING *com;
 
                treeflgs = t->tretyp;
@@ -47,7 +47,7 @@ INT *pf1, *pf2;
                case TCOM:
                        {
                                STRING a1;
-                               INT argn, internal;
+                               int argn, internal;
                                ARGPTR schain = gchain;
                                IOPTR io = t->treio;
                                gchain = 0;
@@ -79,7 +79,7 @@ INT *pf1, *pf2;
 
                                        case SYSDOT:
                                                if (a1) {
-                                                       register INT f;
+                                                       register int f;
 
                                                        if ((f =
                                                             pathopen
@@ -138,7 +138,7 @@ INT *pf1, *pf2;
                                                                ;
                                                        }
                                                        while (*++com) {
-                                                               INT i;
+                                                               int i;
                                                                if ((i =
                                                                     stoi
                                                                     (*com))
@@ -174,7 +174,7 @@ INT *pf1, *pf2;
                                                                ;
                                                        }
                                                } else {        /* print out current traps */
-                                                       INT i;
+                                                       int i;
 
                                                        for (i = 0;
                                                             i < MAXTRAP;
@@ -251,7 +251,7 @@ INT *pf1, *pf2;
 
                                        case SYSSET:
                                                if (a1) {
-                                                       INT argc;
+                                                       int argc;
                                                        argc =
                                                            options(argn,
                                                                    com);
@@ -437,7 +437,7 @@ INT *pf1, *pf2;
 
                case TFIL:
                        {
-                               INT pv[2];
+                               int pv[2];
                                chkpipe(pv);
                                if (execute
                                    (((LSTPTR) t)->lstlef, 0, pf1,
@@ -509,7 +509,7 @@ INT *pf1, *pf2;
                case TWH:
                case TUN:
                        {
-                               INT i = 0;
+                               int i = 0;
 
                                loopcnt++;
                                while (execbrk == 0