Replaced exp with expr to avoild libm conflict

SCCS-vsn: bin/csh/func.c 5.26
SCCS-vsn: bin/csh/extern.h 5.8
SCCS-vsn: bin/csh/set.c 5.15
SCCS-vsn: bin/csh/exp.c 5.14

diff --git a/usr/src/bin/csh/exp.c b/usr/src/bin/csh/exp.c
index 7082836..c215343 100644 (file)
--- a/usr/src/bin/csh/exp.c
+++ b/usr/src/bin/csh/exp.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)exp.c      5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)exp.c      5.14 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -62,7 +62,7 @@ static void   etraci  __P((char *, int, Char ***));
 #endif
 
 int
 #endif
 
 int

-exp(vp)
+expr(vp)

     register Char ***vp;
 {
     return (exp0(vp, 0));
     register Char ***vp;
 {
     return (exp0(vp, 0));

diff --git a/usr/src/bin/csh/extern.h b/usr/src/bin/csh/extern.h
index 7c10d0f..840e577 100644 (file)
--- a/usr/src/bin/csh/extern.h
+++ b/usr/src/bin/csh/extern.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)extern.h    5.7 (Berkeley) %G%
+ *     @(#)extern.h    5.8 (Berkeley) %G%

  */
 
 #include <sys/cdefs.h>
  */
 
 #include <sys/cdefs.h>


@@ -73,7 +73,7 @@ void  xechoit __P((Char **));
 /*
  * exp.c
  */
 /*
  * exp.c
  */

-int    exp __P((Char ***));
+int    expr __P((Char ***));

 int    exp0 __P((Char ***, bool));
 
 /*
 int    exp0 __P((Char ***, bool));
 
 /*

diff --git a/usr/src/bin/csh/func.c b/usr/src/bin/csh/func.c
index 9011738..9d0bb0c 100644 (file)
--- a/usr/src/bin/csh/func.c
+++ b/usr/src/bin/csh/func.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)func.c     5.25 (Berkeley) %G%";
+static char sccsid[] = "@(#)func.c     5.26 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -240,7 +240,7 @@ doif(v, kp)
     register Char **vv;
 
     v++;
     register Char **vv;
 
     v++;

-    i = exp(&v);
+    i = expr(&v);

     vv = v;
     if (*vv == NULL)
        stderror(ERR_NAME | ERR_EMPTYIF);
     vv = v;
     if (*vv == NULL)
        stderror(ERR_NAME | ERR_EMPTYIF);


@@ -368,7 +368,7 @@ doexit(v, t)
      */
     v++;
     if (*v) {
      */
     v++;
     if (*v) {

-       set(STRstatus, putn(exp(&v)));
+       set(STRstatus, putn(expr(&v)));

        if (*v)
            stderror(ERR_NAME | ERR_EXPRESSION);
     }
        if (*v)
            stderror(ERR_NAME | ERR_EXPRESSION);
     }


@@ -438,7 +438,7 @@ dowhile(v, t)
     if (intty && !again)
        status = !exp0(&v, 1);
     else
     if (intty && !again)
        status = !exp0(&v, 1);
     else

-       status = !exp(&v);
+       status = !expr(&v);

     if (*v)
        stderror(ERR_NAME | ERR_EXPRESSION);
     if (!again) {
     if (*v)
        stderror(ERR_NAME | ERR_EXPRESSION);
     if (!again) {

diff --git a/usr/src/bin/csh/set.c b/usr/src/bin/csh/set.c
index 152d0e6..0c76921 100644 (file)
--- a/usr/src/bin/csh/set.c
+++ b/usr/src/bin/csh/set.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)set.c      5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)set.c      5.15 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/types.h>
 #endif /* not lint */
 
 #include <sys/types.h>


@@ -294,7 +294,7 @@ xset(cp, vp)
        xfree((ptr_t) ** vp);
        **vp = dp;
     }
        xfree((ptr_t) ** vp);
        **vp = dp;
     }

-    return (putn(exp(vp)));
+    return (putn(expr(vp)));

 }
 
 static Char *
 }
 
 static Char *


@@ -319,7 +319,7 @@ operate(op, vp, p)
     }
     *v++ = p;
     *v++ = 0;
     }
     *v++ = p;
     *v++ = 0;

-    i = exp(&vecp);
+    i = expr(&vecp);

     if (*vecp)
        stderror(ERR_NAME | ERR_EXPRESSION);
     return (putn(i));
     if (*vecp)
        stderror(ERR_NAME | ERR_EXPRESSION);
     return (putn(i));