Removed -DTELL V6 compatibility flag

SCCS-vsn: bin/csh/lex.c 5.12
SCCS-vsn: bin/csh/csh.c 5.22
SCCS-vsn: bin/csh/csh.h 5.12
SCCS-vsn: bin/csh/misc.c 5.8

diff --git a/usr/src/bin/csh/csh.c b/usr/src/bin/csh/csh.c
index 544e954..7d01f83 100644 (file)
--- a/usr/src/bin/csh/csh.c
+++ b/usr/src/bin/csh/csh.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)csh.c      5.21 (Berkeley) %G%";
+static char sccsid[] = "@(#)csh.c      5.22 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sh.h"
 #endif /* not lint */
 
 #include "sh.h"


@@ -340,9 +340,7 @@ main(argc, argv)
      */
     if (loginsh || intact || intty && isatty(SHOUT))
        setintr = 1;
      */
     if (loginsh || intact || intty && isatty(SHOUT))
        setintr = 1;

-#ifdef TELL

     settell();
     settell();

-#endif

     /*
      * Save the remaining arguments in argv.
      */
     /*
      * Save the remaining arguments in argv.
      */


@@ -591,9 +589,7 @@ srcunit(unit, onlyown, hflg)
     int     oonelflg = onelflg;
     bool    oenterhist = enterhist;
     char    OHIST = HIST;
     int     oonelflg = onelflg;
     bool    oenterhist = enterhist;
     char    OHIST = HIST;

-#ifdef TELL

     bool    otell = cantell;
     bool    otell = cantell;

-#endif

 
     struct Bin saveB;
     sigmask_t omask;
 
     struct Bin saveB;
     sigmask_t omask;


@@ -649,9 +645,7 @@ srcunit(unit, onlyown, hflg)
      */
     if (setintr)
        (void) sigsetmask(omask);
      */
     if (setintr)
        (void) sigsetmask(omask);

-#ifdef TELL

     settell();
     settell();

-#endif

 
     if ((my_reenter = setexit()) == 0)
        process(0);             /* 0 -> blow away on errors */
 
     if ((my_reenter = setexit()) == 0)
        process(0);             /* 0 -> blow away on errors */


@@ -677,9 +671,7 @@ srcunit(unit, onlyown, hflg)
        if (enterhist)
            HIST = OHIST;
        enterhist = oenterhist;
        if (enterhist)
            HIST = OHIST;
        enterhist = oenterhist;

-#ifdef TELL

        cantell = otell;
        cantell = otell;

-#endif

     }
 
     resexit(oldexit);
     }
 
     resexit(oldexit);

diff --git a/usr/src/bin/csh/csh.h b/usr/src/bin/csh/csh.h
index 92e0c93..14d3b01 100644 (file)
--- a/usr/src/bin/csh/csh.h
+++ b/usr/src/bin/csh/csh.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)csh.h       5.11 (Berkeley) %G%
+ *     @(#)csh.h       5.12 (Berkeley) %G%

  */
 
 #ifdef SHORT_STRINGS
  */
 
 #ifdef SHORT_STRINGS


@@ -244,11 +244,8 @@ struct Bin {
  */
 off_t   lineloc;
 
  */
 off_t   lineloc;
 

-#ifdef TELL

 bool    cantell;               /* Is current source tellable ? */
 
 bool    cantell;               /* Is current source tellable ? */
 

-#endif                         /* TELL */
-

 /*
  * Input lines are parsed into doubly linked circular
  * lists of words of the following form.
 /*
  * Input lines are parsed into doubly linked circular
  * lists of words of the following form.

diff --git a/usr/src/bin/csh/lex.c b/usr/src/bin/csh/lex.c
index 2a9b38c..2620409 100644 (file)
--- a/usr/src/bin/csh/lex.c
+++ b/usr/src/bin/csh/lex.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)lex.c      5.11 (Berkeley) %G%";
+static char sccsid[] = "@(#)lex.c      5.12 (Berkeley) %G%";

 
 #endif                         /* not lint */
 
 
 #endif                         /* not lint */
 


@@ -1322,7 +1322,6 @@ bgetc()
 #endif
     char    tbuf[BUFSIZ + 1];
 
 #endif
     char    tbuf[BUFSIZ + 1];
 

-#ifdef TELL

     if (cantell) {
        if (fseekp < fbobp || fseekp > feobp) {
            fbobp = feobp = fseekp;
     if (cantell) {
        if (fseekp < fbobp || fseekp > feobp) {
            fbobp = feobp = fseekp;


@@ -1345,7 +1344,6 @@ bgetc()
        fseekp++;
        return (c);
     }
        fseekp++;
        return (c);
     }

-#endif

 
 again:
     buf = (int) fseekp / BUFSIZ;
 
 again:
     buf = (int) fseekp / BUFSIZ;


@@ -1427,10 +1425,8 @@ bfree()
 {
     register int sb, i;
 
 {
     register int sb, i;
 

-#ifdef TELL

     if (cantell)
        return;
     if (cantell)
        return;

-#endif

     if (whyles)
        return;
     sb = (int) (fseekp - 1) / BUFSIZ;
     if (whyles)
        return;
     sb = (int) (fseekp - 1) / BUFSIZ;


@@ -1449,30 +1445,27 @@ bseek(l)
     off_t   l;
 
 {
     off_t   l;
 
 {

-#ifdef notdef
-    register struct whyle *wp;
-
-#endif

 
     fseekp = l;
 
     fseekp = l;

-#ifdef TELL

     if (!cantell) {
     if (!cantell) {

+#ifdef notdef
+       register struct whyle *wp;

 #endif
 #endif

+

        if (!whyles)
            return;
 #ifdef notdef
        /*
         * Christos: I don't understand this? both wp and l are local. What is
         * this used for? I suspect the author meant fseek = wp->w_start
        if (!whyles)
            return;
 #ifdef notdef
        /*
         * Christos: I don't understand this? both wp and l are local. What is
         * this used for? I suspect the author meant fseek = wp->w_start

+        * This seek/tell stuff needs to be re-written...

         */
        for (wp = whyles; wp->w_next; wp = wp->w_next)
            continue;
        if (wp->w_start > l)
            l = wp->w_start;
 #endif
         */
        for (wp = whyles; wp->w_next; wp = wp->w_next)
            continue;
        if (wp->w_start > l)
            l = wp->w_start;
 #endif

-#ifdef TELL

     }
     }

-#endif

 }
 
 /* any similarity to bell telephone is purely accidental */
 }
 
 /* any similarity to bell telephone is purely accidental */


@@ -1493,7 +1486,6 @@ btoeof()
     bfree();
 }
 
     bfree();
 }
 

-#ifdef TELL

 void
 settell()
 {
 void
 settell()
 {


@@ -1508,5 +1500,3 @@ settell()
     fseekp = fbobp = feobp = lseek(SHIN, (off_t) 0, L_INCR);
     cantell = 1;
 }
     fseekp = fbobp = feobp = lseek(SHIN, (off_t) 0, L_INCR);
     cantell = 1;
 }

-
-#endif

diff --git a/usr/src/bin/csh/misc.c b/usr/src/bin/csh/misc.c
index 2463b3b..fdb2eaa 100644 (file)
--- a/usr/src/bin/csh/misc.c
+++ b/usr/src/bin/csh/misc.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)misc.c     5.7 (Berkeley) %G%";
+static char sccsid[] = "@(#)misc.c     5.8 (Berkeley) %G%";

 #endif /* not lint */
 
 #include "sh.h"
 #endif /* not lint */
 
 #include "sh.h"


@@ -133,7 +133,7 @@ saveblk(v)
     return (onewv);
 }
 
     return (onewv);
 }
 

-#ifdef notdef
+#ifdef NOTUSED

 char   *
 strstr(s, t)
     register char *s, *t;
 char   *
 strstr(s, t)
     register char *s, *t;


@@ -150,7 +150,7 @@ strstr(s, t)
     return ((char *) 0);
 }
 
     return ((char *) 0);
 }
 

-#endif                         /* notdef */
+#endif /* NOTUSED */

 
 #ifndef SHORT_STRINGS
 char   *
 
 #ifndef SHORT_STRINGS
 char   *