From: craig@adikia.sccsi.com (Craig Groeschel)
Newsgroups: comp.os.linux
Subject: patches for elvis-1.6 (long)
Date: 27 Dec 92 04:29:25 GMT
Organization: Craig's Linux gonkulator

Here is what I had to change to get elvis 1.6 to compile on my machine.
To apply these patches use something like
   patch -d /usr/src/elvis-1.6/src < elvis.dif
Hope they save time.

diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/cmd1.c /local/src/elvis-1.6/src/cmd1.c
*** /tmp/elvis-1.6/src/cmd1.c	Sun Aug 23 01:18:19 1992
--- /local/src/elvis-1.6/src/cmd1.c	Sat Nov 28 22:43:15 1992
***************
*** 1192,1196 ****
  {
  	REG char	*cpy;
- 	long		atol();
  # if COHERENT || TOS /* any Mark Williams compiler */
  	/* Get the line number.  If no line number, then ignore this line. */
--- 1192,1195 ----
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/fmt.c /local/src/elvis-1.6/src/fmt.c
*** /tmp/elvis-1.6/src/fmt.c	Sun Aug 23 01:18:23 1992
--- /local/src/elvis-1.6/src/fmt.c	Sat Dec 26 21:18:28 1992
***************
*** 21,25 ****
  
  int	width = 72;	/* the desired line width */
! int	isblank;	/* is the current output line blank? */
  int	indent;		/* width of the indentation */
  char	ind[512];	/* indentation text */
--- 21,25 ----
  
  int	width = 72;	/* the desired line width */
! int	isblnk;	/* is the current output line blank? */
  int	indent;		/* width of the indentation */
  char	ind[512];	/* indentation text */
***************
*** 65,69 ****
  
  	/* if this is the first word on the line... */
! 	if (isblank)
  	{
  		/* output the indentation first */
--- 65,69 ----
  
  	/* if this is the first word on the line... */
! 	if (isblnk)
  	{
  		/* output the indentation first */
***************
*** 100,104 ****
  
  	/* this output line isn't blank anymore. */
! 	isblank = FALSE;
  }
  
--- 100,104 ----
  
  	/* this output line isn't blank anymore. */
! 	isblnk = FALSE;
  }
  
***************
*** 116,120 ****
  
  	/* for each character in the stream... */
! 	for (indent = -1, isblank = TRUE, inword = FALSE, i = 0, prevch = '\n';
  	     (ch = getc(in)) != EOF;
  	     prevch = ch)
--- 116,120 ----
  
  	/* for each character in the stream... */
! 	for (indent = -1, isblnk = TRUE, inword = FALSE, i = 0, prevch = '\n';
  	     (ch = getc(in)) != EOF;
  	     prevch = ch)
***************
*** 137,144 ****
  			{
  				/* finish the previous paragraph */
! 				if (!isblank)
  				{
  					putchar('\n');
! 					isblank = TRUE;
  				}
  
--- 137,144 ----
  			{
  				/* finish the previous paragraph */
! 				if (!isblnk)
  				{
  					putchar('\n');
! 					isblnk = TRUE;
  				}
  
***************
*** 207,214 ****
  
  	/* if necessary, write a final newline */
! 	if (!isblank)
  	{
  		putchar('\n');
! 		isblank = TRUE;
  	}
  }
--- 207,214 ----
  
  	/* if necessary, write a final newline */
! 	if (!isblnk)
  	{
  		putchar('\n');
! 		isblnk = TRUE;
  	}
  }
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/move2.c /local/src/elvis-1.6/src/move2.c
*** /tmp/elvis-1.6/src/move2.c	Sun Aug 23 01:18:26 1992
--- /local/src/elvis-1.6/src/move2.c	Sat Dec 26 21:35:19 1992
***************
*** 15,19 ****
  #include "regexp.h"
  
- extern long	atol();
  
  static regexp	*re;	/* compiled version of the pattern to search for */
--- 15,18 ----
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/ref.c /local/src/elvis-1.6/src/ref.c
*** /tmp/elvis-1.6/src/ref.c	Sun Aug 23 01:18:31 1992
--- /local/src/elvis-1.6/src/ref.c	Sat Dec 26 21:36:53 1992
***************
*** 25,29 ****
  extern int	countcolons P_((char *));
  extern void	main P_((int, char **));
- extern char	*getenv P_((char *));
  
  
--- 25,28 ----
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/tmp.c /local/src/elvis-1.6/src/tmp.c
*** /tmp/elvis-1.6/src/tmp.c	Sun Aug 23 01:18:34 1992
--- /local/src/elvis-1.6/src/tmp.c	Sat Nov 28 22:38:28 1992
***************
*** 176,180 ****
  	else
  	{
! 		setflag(file, NOFILE);
  		origfd = -1;
  		origtime = 0L;
--- 176,180 ----
  	else
  	{
! 		setflag(file, NOFILEvi);
  		origfd = -1;
  		origtime = 0L;
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/unix.c /local/src/elvis-1.6/src/unix.c
*** /tmp/elvis-1.6/src/unix.c	Sun Aug 23 01:18:35 1992
--- /local/src/elvis-1.6/src/unix.c	Sat Dec 26 21:13:38 1992
***************
*** 118,122 ****
  int ttyread(buf, len, time)
  	char	*buf;	/* where to store the gotten characters */
! 	unsigned len;	/* maximum number of characters to read */
  	int	time;	/* maximum time to allow for reading */
  {
--- 118,122 ----
  int ttyread(buf, len, time)
  	char	*buf;	/* where to store the gotten characters */
! 	int     len;	/* maximum number of characters to read */
  	int	time;	/* maximum time to allow for reading */
  {
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/vcmd.c /local/src/elvis-1.6/src/vcmd.c
*** /tmp/elvis-1.6/src/vcmd.c	Sun Aug 23 01:18:36 1992
--- /local/src/elvis-1.6/src/vcmd.c	Sat Dec 26 21:37:41 1992
***************
*** 650,654 ****
  	static	sign;
  	char	newval[12];
- 	long	atol();
  
  	DEFAULT(1);
--- 650,653 ----
diff +recursive +ignore-space-change -c2 /tmp/elvis-1.6/src/vi.h /local/src/elvis-1.6/src/vi.h
*** /tmp/elvis-1.6/src/vi.h	Sun Aug 23 01:18:37 1992
--- /local/src/elvis-1.6/src/vi.h	Sat Nov 28 22:37:05 1992
***************
*** 105,109 ****
  #define HADNUL		0x0004	/* the file contained NUL characters */
  #define MODIFIED	0x0008	/* the file has been modified, but not saved */
! #define NOFILE		0x0010	/* no name is known for the current text */
  #define ADDEDNL		0x0020	/* newlines were added to the file */
  #define HADBS		0x0040	/* backspace chars were lost from the file */
--- 105,109 ----
  #define HADNUL		0x0004	/* the file contained NUL characters */
  #define MODIFIED	0x0008	/* the file has been modified, but not saved */
! #define NOFILEvi       	0x0010	/* no name is known for the current text */
  #define ADDEDNL		0x0020	/* newlines were added to the file */
  #define HADBS		0x0040	/* backspace chars were lost from the file */
*** Makefile.mix	Sun Aug 23 01:18:15 1992
--- Makefile	Sat Dec 26 22:02:47 1992
***************
*** 37,62 ****
  
  #---- These settings are recommended for System-V UNIX and SCO XENIX-386 ----
! #OBJ=	.o
! #EXE=
! #COM=
! #EXTRA=	unix$(OBJ)
! #EXTRA2=
! #LIBS=	-lterm
! #BIN=	/usr/local/bin
! #CC=	cc
! #CFLAGS=	-DM_SYSV -O -DNO_SHIFT_FKEYS
! #SMALL=
! #OF=	-o ""
! #RF=	-c
! #EVAL=	eval
! #PROGS=	elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) fmt$(COM) \
! #	elvprsv$(COM)
! #CHMEM=
! #SORT=	-DSORT
! #RM=	rm -f
! #CP=	cp
! #SYS=	unx
! #DUMMY=
! #CFG=
  
  #---- These settings are recommended for SCO XENIX-286 ----
--- 37,62 ----
  
  #---- These settings are recommended for System-V UNIX and SCO XENIX-386 ----
! OBJ=	.o
! EXE=
! COM=
! EXTRA=	unix$(OBJ)
! EXTRA2=
! LIBS=	-ltermcap
! BIN=	/usr/local/bin
! CC=	cc
! CFLAGS=	-DM_SYSV -O -DNO_SHIFT_FKEYS -DTERMIOS -DFILEPERMS=0644 -DMAILER=\"mail\"
! SMALL=
! OF=	-o ""
! RF=	-c
! EVAL=	eval
! PROGS=	elvis$(EXE) ctags$(COM) ref$(COM) elvrec$(COM) fmt$(COM) \
! 	elvprsv$(COM)
! CHMEM=
! SORT=	-DSORT
! RM=	rm -f
! CP=	cp
! SYS=	unx
! DUMMY=
! CFG=
  
  #---- These settings are recommended for SCO XENIX-286 ----