diff options
Diffstat (limited to 'bin/csh/exp.c')
| -rw-r--r-- | bin/csh/exp.c | 95 |
1 files changed, 49 insertions, 46 deletions
diff --git a/bin/csh/exp.c b/bin/csh/exp.c index ff484ce..8d163cf 100644 --- a/bin/csh/exp.c +++ b/bin/csh/exp.c @@ -29,12 +29,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id$ */ #ifndef lint +#if 0 static char sccsid[] = "@(#)exp.c 8.1 (Berkeley) 5/31/93"; +#else +static const char rcsid[] = + "$Id: exp.c,v 1.4 1997/02/22 14:01:52 peter Exp $"; +#endif #endif /* not lint */ #include <sys/types.h> @@ -91,23 +94,23 @@ static void etraci __P((char *, int, Char ***)); int expr(vp) - register Char ***vp; + Char ***vp; { return (exp0(vp, 0)); } int exp0(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register int p1 = exp1(vp, ignore); + int p1 = exp1(vp, ignore); #ifdef EDEBUG etraci("exp0 p1", p1, vp); #endif if (**vp && eq(**vp, STRor2)) { - register int p2; + int p2; (*vp)++; p2 = exp0(vp, (ignore & IGNORE) || p1); @@ -121,16 +124,16 @@ exp0(vp, ignore) static int exp1(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register int p1 = exp2(vp, ignore); + int p1 = exp2(vp, ignore); #ifdef EDEBUG etraci("exp1 p1", p1, vp); #endif if (**vp && eq(**vp, STRand2)) { - register int p2; + int p2; (*vp)++; p2 = exp1(vp, (ignore & IGNORE) || !p1); @@ -144,16 +147,16 @@ exp1(vp, ignore) static int exp2(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register int p1 = exp2a(vp, ignore); + int p1 = exp2a(vp, ignore); #ifdef EDEBUG etraci("exp3 p1", p1, vp); #endif if (**vp && eq(**vp, STRor)) { - register int p2; + int p2; (*vp)++; p2 = exp2(vp, ignore); @@ -167,16 +170,16 @@ exp2(vp, ignore) static int exp2a(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register int p1 = exp2b(vp, ignore); + int p1 = exp2b(vp, ignore); #ifdef EDEBUG etraci("exp2a p1", p1, vp); #endif if (**vp && eq(**vp, STRcaret)) { - register int p2; + int p2; (*vp)++; p2 = exp2a(vp, ignore); @@ -190,16 +193,16 @@ exp2a(vp, ignore) static int exp2b(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register int p1 = exp2c(vp, ignore); + int p1 = exp2c(vp, ignore); #ifdef EDEBUG etraci("exp2b p1", p1, vp); #endif if (**vp && eq(**vp, STRand)) { - register int p2; + int p2; (*vp)++; p2 = exp2b(vp, ignore); @@ -213,12 +216,12 @@ exp2b(vp, ignore) static int exp2c(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register Char *p1 = exp3(vp, ignore); - register Char *p2; - register int i; + Char *p1 = exp3(vp, ignore); + Char *p2; + int i; #ifdef EDEBUG etracc("exp2c p1", p1, vp); @@ -261,11 +264,11 @@ exp2c(vp, ignore) static Char * exp3(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register Char *p1, *p2; - register int i; + Char *p1, *p2; + int i; p1 = exp3a(vp, ignore); #ifdef EDEBUG @@ -307,11 +310,11 @@ exp3(vp, ignore) static Char * exp3a(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register Char *p1, *p2, *op; - register int i; + Char *p1, *p2, *op; + int i; p1 = exp4(vp, ignore); #ifdef EDEBUG @@ -337,18 +340,18 @@ exp3a(vp, ignore) static Char * exp4(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register Char *p1, *p2; - register int i = 0; + Char *p1, *p2; + int i = 0; p1 = exp5(vp, ignore); #ifdef EDEBUG etracc("exp4 p1", p1, vp); #endif if (isa(**vp, ADDOP)) { - register Char *op = *(*vp)++; + Char *op = *(*vp)++; p2 = exp4(vp, ignore); #ifdef EDEBUG @@ -374,18 +377,18 @@ exp4(vp, ignore) static Char * exp5(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { - register Char *p1, *p2; - register int i = 0; + Char *p1, *p2; + int i = 0; p1 = exp6(vp, ignore); #ifdef EDEBUG etracc("exp5 p1", p1, vp); #endif if (isa(**vp, MULOP)) { - register Char *op = *(*vp)++; + Char *op = *(*vp)++; p2 = exp5(vp, ignore); #ifdef EDEBUG @@ -421,11 +424,11 @@ exp5(vp, ignore) static Char * exp6(vp, ignore) - register Char ***vp; + Char ***vp; bool ignore; { int ccode, i = 0; - register Char *cp, *dp, *ep; + Char *cp, *dp, *ep; if (**vp == 0) stderror(ERR_NAME | ERR_EXPRESSION); @@ -461,7 +464,7 @@ exp6(vp, ignore) return (putn(ccode)); } if (eq(**vp, STRLbrace)) { - register Char **v; + Char **v; struct command faket; Char *fakecom[2]; @@ -600,18 +603,18 @@ exp6(vp, ignore) static void evalav(v) - register Char **v; + Char **v; { struct wordent paraml1; - register struct wordent *hp = ¶ml1; + struct wordent *hp = ¶ml1; struct command *t; - register struct wordent *wdp = hp; + struct wordent *wdp = hp; set(STRstatus, Strsave(STR0)); hp->prev = hp->next = hp; hp->word = STRNULL; while (*v) { - register struct wordent *new = + struct wordent *new = (struct wordent *) xcalloc(1, sizeof *wdp); new->prev = wdp; @@ -631,8 +634,8 @@ evalav(v) static int isa(cp, what) - register Char *cp; - register int what; + Char *cp; + int what; { if (cp == 0) return ((what & RESTOP) != 0); @@ -680,7 +683,7 @@ isa(cp, what) static int egetn(cp) - register Char *cp; + Char *cp; { if (*cp && *cp != '-' && !Isdigit(*cp)) stderror(ERR_NAME | ERR_EXPRESSION); |
