Post-demacification changes for bin/sh

diff --git a/bin/sh/args.c b/bin/sh/args.c
index 5b38781..fedc8a8 100644 (file)
--- a/bin/sh/args.c
+++ b/bin/sh/args.c
@@ -104,10 +104,10 @@ freeargs(blk)
        return(argr);
 }
 
-static char*CHECKME *  copyargs(from, n)
+static char ** copyargs(from, n)
        char            *from[];
 {
-       register char **        np=alloc(sizeof(char*CHECKME*)*n+3*BYTESPERWORD);
+       register char **        np=alloc(sizeof(char **)*n+3*BYTESPERWORD);
        register char **        fp=from;
        register char **        pp=np;
 

diff --git a/bin/sh/cmd.c b/bin/sh/cmd.c
index e76f54c..b6f839a 100644 (file)
--- a/bin/sh/cmd.c
+++ b/bin/sh/cmd.c
@@ -32,7 +32,7 @@ extern void   synbad();
 
 
 
-struct trenod*CHECKME  makefork(flgs, i)
+struct trenod  *makefork(flgs, i)
        int             flgs;
        struct trenod           *i;
 {
@@ -43,9 +43,9 @@ struct trenod*CHECKME makefork(flgs, i)
        return(t);
 }
 
-static struct trenod*CHECKME   makelist(type,i,r)
+static struct trenod   *makelist(type,i,r)
        int             type;
-       struct trenod*CHECKME           i, r;
+       struct trenod           *i, *r;
 {
        register struct trenod  *t;
 
@@ -68,11 +68,11 @@ static struct trenod*CHECKME        makelist(type,i,r)
  *     list [ ; cmd ]
  */
 
-struct trenod*CHECKME  cmd(sym,flg)
+struct trenod  *cmd(sym,flg)
        register int            sym;
        int             flg;
 {
-       register struct trenod*CHECKME  i, e;
+       register struct trenod  *i, *e;
 
        i = list(flg);
 
@@ -214,7 +214,7 @@ static struct trenod        *item(flag)
        register struct ionod   *io;
 
        if (flag) {
-               io=inout((struct ionod*CHECKME)0);
+               io=inout((struct ionod *)0);
        }
        else {
                io=0;

diff --git a/bin/sh/error.c b/bin/sh/error.c
index 47fab9b..2987cb6 100644 (file)
--- a/bin/sh/error.c
+++ b/bin/sh/error.c
@@ -33,7 +33,7 @@ sigchk()
 }
 
 failed(s1,s2)
-       char*CHECKME    s1, s2;
+       char    *s1, *s2;
 {
        prp(); prs(s1); 
        if (s2) {

diff --git a/bin/sh/expand.c b/bin/sh/expand.c
index f0d4a48..c6bee1c 100644 (file)
--- a/bin/sh/expand.c
+++ b/bin/sh/expand.c
@@ -37,7 +37,7 @@ int   expand(as,rflg)
        DIR             *dirf;
        bool            dir=0;
        char            *rescan = 0;
-       register char*CHECKME   s, cs;
+       register char   *s, *cs;
        struct argnod           *schain = gchain;
        struct direct   *dp;
        struct stat             statb;
@@ -52,7 +52,7 @@ int   expand(as,rflg)
           register bool slash; slash=0;
           while (!fngchar(*cs)) {
                if (*cs++==0) {
-                       if (rflg && slash) { break; }NEWLINEelse { return(0); }
+                       if (rflg && slash) { break; } else { return(0); }
                }
                else if (*cs=='/') {
                        slash++;
@@ -121,7 +121,7 @@ int expand(as,rflg)
 }
 
 gmatch(s, p)
-       register char*CHECKME   s, p;
+       register char   *s, *p;
 {
        register int            scc;
        char            c;
@@ -161,7 +161,8 @@ gmatch(s, p)
                if (*p==0) { return(1); }
                --s;
                while (*s) {
-                   if (gmatch(s++,p)) { return(1); }NEWLINE}
+                   if (gmatch(s++,p)) { return(1); }
+               }
                return(0);
 
            case 0:
@@ -170,9 +171,9 @@ gmatch(s, p)
 }
 
 static void    addg(as1,as2,as3)
-       char*CHECKME            as1, as2, as3;
+       char            *as1, *as2, *as3;
 {
-       register char*CHECKME   s1, s2;
+       register char   *s1, *s2;
        register int            c;
 
        s2 = locstak()+BYTESPERWORD;

diff --git a/bin/sh/macro.c b/bin/sh/macro.c
index ec969fd..8ceb346 100644 (file)
--- a/bin/sh/macro.c
+++ b/bin/sh/macro.c
@@ -65,7 +65,7 @@ retry:
                        struct namnod           *n=NIL;
                        int             dolg=0;
                        bool            bra;
-                       register char*CHECKME   argp, v;
+                       register char   *argp, *v;
                        char            idb[2];
                        char            *id=idb;
 
@@ -209,7 +209,7 @@ static      comsubst()
        }
        {
             
-          register struct trenod*CHECKME       t = makefork(FPOU,cmd(EOFSYM,MTFLG|NLFLG));
+          register struct trenod       *t = makefork(FPOU,cmd(EOFSYM,MTFLG|NLFLG));
           int          pv[2];
 
           /* this is done like this so that the pipe

diff --git a/bin/sh/name.c b/bin/sh/name.c
index f9774d7..b6440aa 100644 (file)
--- a/bin/sh/name.c
+++ b/bin/sh/name.c
@@ -59,7 +59,7 @@ setlist(arg,xp)
           arg=arg->argnxt;
           if (flags&execpr) {
                prs(s);
-               if (arg) { blank(); }NEWLINEelse { newline(); }
+               if (arg) { blank(); } else { newline(); }
           }
        }
 }
@@ -166,7 +166,7 @@ int readvar(names)
        }
        while (n) {
           assign(n, nullstr);
-          if (*names) { n=lookup(*names++); }NEWLINEelse { n=0; }
+          if (*names) { n=lookup(*names++); } else { n=0; }
        }
 
        if (eof) { rc=1; }

diff --git a/bin/sh/service.c b/bin/sh/service.c
index e940797..8f8b510 100644 (file)
--- a/bin/sh/service.c
+++ b/bin/sh/service.c
@@ -100,7 +100,7 @@ char        *getpath(s)
 }
 
 int    pathopen(path, name)
-       register char*CHECKME   path, name;
+       register char   *path, *name;
 {
        register int            f;
 
@@ -110,13 +110,13 @@ int       pathopen(path, name)
        return(f);
 }
 
-char*CHECKME   catpath(path,name)
+char   *catpath(path,name)
        register char   *path;
        char            *name;
 {
        /* leaves result on top of stack */
-       register char*CHECKME   scanp = path,
-                       argp = locstak();
+       register char   *scanp = path,
+                       *argp = locstak();
 
        while (*scanp && *scanp!=':') { *argp++ = *scanp++; }
        if (scanp!=path) { *argp++='/'; }
@@ -144,11 +144,11 @@ void      execa(at)
        }
 }
 
-static char*CHECKME    execs(ap,t)
+static char    *execs(ap,t)
        char            *ap;
        register char   *t[];
 {
-       register char*CHECKME   p, prefix;
+       register char   *p, *prefix;
 
        prefix=catpath(ap,t[0]);
        trim(p=curstak());
@@ -333,7 +333,7 @@ char        **scan(argn)
        int             argn;
 {
        register struct argnod  *argp = Rcheat(gchain)&~ARGMK;
-       register char*CHECKME   *comargn, *comargm;
+       register char   **comargn, **comargm;
 
        comargn=getstak(BYTESPERWORD*argn+BYTESPERWORD); comargm = comargn += argn; *comargn = ENDARGS;
 
@@ -353,7 +353,7 @@ char        **scan(argn)
 }
 
 static void    gsort(from,to)
-       char*CHECKME            from[], to[];
+       char            *from[], *to[];
 {
        int             k, m, n;
        register int            i, j;

diff --git a/bin/sh/string.c b/bin/sh/string.c
index 56981c3..7aedcc5 100644 (file)
--- a/bin/sh/string.c
+++ b/bin/sh/string.c
@@ -17,8 +17,8 @@ static char sccsid[] = "@(#)string.c  4.2 8/11/83";
 /* ========    general purpose string handling ======== */
 
 
-char*CHECKME   movstr(a,b)
-       register char*CHECKME   a, b;
+char   *movstr(a,b)
+       register char   *a, *b;
 {
        while (*b++ = *a++);
        return(--b);
@@ -39,7 +39,7 @@ int   any(c,s)
 }
 
 int    cf(s1, s2)
-       register char*CHECKME s1, s2;
+       register char *s1, *s2;
 {
        while (*s1++ == *s2) {
                if (*s2++==0) {