rename all the files (they weren't going to diff anyway)

[unix-history] / usr / src / bin / csh / lex.c

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

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

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

-#include "sh.h"
+#include "csh.h"
+#include "extern.h"

 
 /*
  * These lexical routines read input and form lists of words.
 
 /*
  * These lexical routines read input and form lists of words.


@@ -101,7 +102,7 @@ lex(hp)
     register struct wordent *wdp;
     int     c;
 
     register struct wordent *wdp;
     int     c;
 

-    lineloc = btell();
+    lineloc = fseekp;

     hp->next = hp->prev = hp;
     hp->word = STRNULL;
     alvecp = 0, hadhist = 0;
     hp->next = hp->prev = hp;
     hp->word = STRNULL;
     alvecp = 0, hadhist = 0;


@@ -1192,7 +1193,7 @@ setexclp(cp)
 
 void
 unreadc(c)
 
 void
 unreadc(c)

-    Char    c;
+    int    c;

 {
     peekread = c;
 }
 {
     peekread = c;
 }


@@ -1468,15 +1469,6 @@ bseek(l)
     }
 }
 
     }
 }
 

-/* any similarity to bell telephone is purely accidental */
-#ifndef btell
-off_t
-btell()
-{
-    return (fseekp);
-}
-#endif
-

 void
 btoeof()
 {
 void
 btoeof()
 {