===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diff.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/diff/diff.c	2003/07/04 17:37:07	1.20
--- src/usr.bin/diff/diff.c	2003/07/04 17:50:24	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: diff.c,v 1.20 2003/07/04 17:37:07 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff.c,v 1.21 2003/07/04 17:50:24 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 58,64 ****
  int	wflag;			/* totally ignore blanks in comparisons */
  int	iflag;			/* ignore case in comparisons */
  /* Options on hierarchical diffs. */
- int	lflag;			/* long output format with header */
  int	rflag;			/* recursively trace directories */
  int	sflag;			/* announce files which are same */
  char	*start;			/* do file only if name >= this */
--- 58,63 ----
***************
*** 91,97 ****
  	status = 2;
  	diffargv = argv;
  
! 	while ((ch = getopt(argc, argv, "abC:cD:efilnrS:stU:uw")) != -1) {
  		switch (ch) {
  		case 'a':
  			aflag++;
--- 90,96 ----
  	status = 2;
  	diffargv = argv;
  
! 	while ((ch = getopt(argc, argv, "abC:cD:efinrS:stU:uw")) != -1) {
  		switch (ch) {
  		case 'a':
  			aflag++;
***************
*** 122,130 ****
  		case 'i':
  			iflag++;
  			break;
- 		case 'l':
- 			lflag++;
- 			break;
  		case 'n':
  			opt = D_NREVERSE;
  			break;
--- 121,126 ----
***************
*** 260,271 ****
  usage(void)
  {
  	(void)fprintf(stderr,
! 	    "usage: diff [-bitw] [-c | -e | -f | -h | -n | -u ] file1 file2\n"
  	    "       diff [-bitw] -C number file1 file2\n"
  	    "       diff [-bitw] -D string file1 file2\n"
  	    "       diff [-bitw] -U number file1 file2\n"
! 	    "       diff [-biwt] [-c | -e | -f | -h | -n | -u ] "
! 	    "[-l] [-r] [-s] [-S name]\n            dir1 dir2\n");
  
  	exit(2);
  }
--- 256,267 ----
  usage(void)
  {
  	(void)fprintf(stderr,
! 	    "usage: diff [-bitw] [-c | -e | -f | -n | -u ] file1 file2\n"
  	    "       diff [-bitw] -C number file1 file2\n"
  	    "       diff [-bitw] -D string file1 file2\n"
  	    "       diff [-bitw] -U number file1 file2\n"
! 	    "       diff [-biwt] [-c | -e | -f | -n | -u ] "
! 	    "[-r] [-s] [-S name]\n            dir1 dir2\n");
  
  	exit(2);
  }