diff ./display.c ../goodwork/display.c
577d576
< 	extern	char	*sys_errlist[];
diff ./getwd.c ../goodwork/getwd.c
17c17
< #ifndef BSD
---
> #if	!defined(BSD) && !defined(__linux__)
diff ./global.h ../goodwork/global.h
36c36,40
< typedef	int	pid_t;
---
> #if 0
> typedef	int	pid_t; /
> #else
> #include <sys/types.h>
> #endif
diff ./invlib.c ../goodwork/invlib.c
9a10
> #include <assert.h>
182a184
> 		assert(s);
diff ./library.h ../goodwork/library.h
44a45
> struct	stat;	/* Forward declaration */
diff ./main.c ../goodwork/main.c
1316c1316
< #ifdef __BORLANDC__
---
> #if	defined(__BORLANDC__) || 1
diff ./makefile ../goodwork/makefile
0a1
> # DEBUG=-pg
4a6,9
> # Linux calls it libfl
> # LEXLIB=-lfl
> LEXLIB=-ll
> 
16c21
< BSD = U
---
> BSD = D
19c24
< #LIBS = -ltermcap
---
> LIBS = -ltermcap
31c36
< TMPDIR= /usr/tmp
---
> TMPDIR= /var/tmp
58c63
< 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES) -ll $(LIBS)
---
> 	$(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES) $(LEXLIB) $(LIBS)
118,120c123,125
< rmake!svr2:		cscope.cpio
< 		$(TOOLS)/adm/bin/machines -f type name!=3b20 and name!=vax and release!=SunOS and release!=BSD4.3 and release!=SVR4 and name!=i386 $(NAME) | xargs -l1 -i -t $(RMAKE) -p cscope -P .pkg.cscope -s cscope.cpio -t cscope -u -m {}
< 
---
> #rmake!svr2:		cscope.cpio
> #		$(TOOLS)/adm/bin/machines -f type name!=3b20 and name!=vax and release!=SunOS and release!=BSD4.3 and release!=SVR4 and name!=i386 $(NAME) | xargs -l1 -i -t $(RMAKE) -p cscope -P .pkg.cscope -s cscope.cpio -t cscope -u -m {}
> #
141d145
< 
diff ./scanner.l ../goodwork/scanner.l
0a1
> %array
15a17
> #ifdef	HAS_ATTLEX
29a32,40
> #else	/* HAS_ATTLEX */
> int 
> noncommentinput()
> {
> 	int c;
> 	c = input();
> 	return  (c == EOF) ? LEXEOF : c;
> }
> #endif	/* HAS_ATTLEX */
42a54,56
> #ifndef	HAS_ATTLEX
> int	yylineno; /* current line number */
> #endif
76a91
> 
199a215,253
> "//"		{		/* Skip C++ comment */
> 			int c;
> 			while ( (c = input()) != '\n' && c != EOF) 
> 				;
> 			if (c == EOF) {
> 				return LEXEOF;
> 			} else {
> 				unput(c);
> 			}
> 			goto more;
> 		}
> 
> "/*"		{
> 			int c;
> 
> 			for ( ; ; ) {
> 				/* eat up text of comment */
> 				while ( (c = input()) != '*' && c != EOF ) {
> 					if (c == '\n') {
> 						yylineno++;    
> 					}
> 				}
> 		    
> 
> 				if ( c == '*' ) {
> 					while ( (c = input()) == '*' )
> 						;
> 					if (c == '\n') {
> 						yylineno++;
> 					}
> 					if ( c == '/' )
> 						break;    /* found the end */
> 				}
> 
> 				if ( c == EOF )
> 					return LEXEOF;
> 			}
> 			goto more;
> 		}
592c646
< 				(void) yyless(yyleng - 1);	/* rescan \n */
---
> 				yyless(yyleng - 1);	/* rescan \n */
