===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/vis/vis.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/vis/vis.c	2003/09/08 00:07:41	1.8
--- src/usr.bin/vis/vis.c	2004/09/14 23:01:06	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: vis.c,v 1.8 2003/09/08 00:07:41 millert Exp $	*/
  /*	$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $	*/
  
  /*-
--- 1,4 ----
! /*	$OpenBSD: vis.c,v 1.9 2004/09/14 23:01:06 deraadt Exp $	*/
  /*	$NetBSD: vis.c,v 1.4 1994/12/20 16:13:03 jtc Exp $	*/
  
  /*-
***************
*** 40,46 ****
  #if 0
  static const char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
  #endif
! static const char rcsid[] = "$OpenBSD: vis.c,v 1.8 2003/09/08 00:07:41 millert Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
--- 40,46 ----
  #if 0
  static const char sccsid[] = "@(#)vis.c	8.1 (Berkeley) 6/6/93";
  #endif
! static const char rcsid[] = "$OpenBSD: vis.c,v 1.9 2004/09/14 23:01:06 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
***************
*** 50,59 ****
  #include <err.h>
  #include <vis.h>
  
! int eflags, fold, foldwidth=80, none, markeol, debug;
  
  int foldit(char *, int, int);
! void process(FILE *, char *);
  __dead void usage(void);
  
  int
--- 50,63 ----
  #include <err.h>
  #include <vis.h>
  
! int eflags, fold, foldwidth=80, none, markeol;
  
+ #ifdef DEBUG
+ int debug;
+ #endif
+ 
  int foldit(char *, int, int);
! void process(FILE *);
  __dead void usage(void);
  
  int
***************
*** 112,129 ****
  	if (*argv)
  		while (*argv) {
  			if ((fp=fopen(*argv, "r")) != NULL)
! 				process(fp, *argv);
  			else
  				warn("%s", *argv);
  			argv++;
  		}
  	else
! 		process(stdin, "<stdin>");
  	exit(0);
  }
  	
  void
! process(FILE *fp, char *filename)
  {
  	static int col = 0;
  	char *cp = "\0"+1;	/* so *(cp-1) starts out != '\n' */
--- 116,133 ----
  	if (*argv)
  		while (*argv) {
  			if ((fp=fopen(*argv, "r")) != NULL)
! 				process(fp);
  			else
  				warn("%s", *argv);
  			argv++;
  		}
  	else
! 		process(stdin);
  	exit(0);
  }
  	
  void
! process(FILE *fp)
  {
  	static int col = 0;
  	char *cp = "\0"+1;	/* so *(cp-1) starts out != '\n' */