===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diff.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/diff/diff.c	2009/06/06 15:00:27	1.51
--- src/usr.bin/diff/diff.c	2009/06/06 15:37:28	1.52
***************
*** 1,4 ****
! /*	$OpenBSD: diff.c,v 1.51 2009/06/06 15:00:27 ray Exp $	*/
  
  /*
   * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: diff.c,v 1.52 2009/06/06 15:37:28 ray Exp $	*/
  
  /*
   * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 21,27 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff.c,v 1.51 2009/06/06 15:00:27 ray Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 21,27 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff.c,v 1.52 2009/06/06 15:37:28 ray Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 256,262 ****
  	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
  		if (format == D_IFDEF)
  			errx(2, "-D option not supported with directories");
! 		diffdir(argv[0], argv[1]);
  	} else {
  		if (S_ISDIR(stb1.st_mode)) {
  			argv[0] = splice(argv[0], argv[1]);
--- 256,262 ----
  	if (S_ISDIR(stb1.st_mode) && S_ISDIR(stb2.st_mode)) {
  		if (format == D_IFDEF)
  			errx(2, "-D option not supported with directories");
! 		diffdir(argv[0], argv[1], dflags);
  	} else {
  		if (S_ISDIR(stb1.st_mode)) {
  			argv[0] = splice(argv[0], argv[1]);
***************
*** 268,274 ****
  			if (stat(argv[1], &stb2) < 0)
  				err(2, "%s", argv[1]);
  		}
! 		print_status(diffreg(argv[0], argv[1], 0), argv[0], argv[1],
  		    NULL);
  	}
  	exit(status);
--- 268,274 ----
  			if (stat(argv[1], &stb2) < 0)
  				err(2, "%s", argv[1]);
  		}
! 		print_status(diffreg(argv[0], argv[1], dflags), argv[0], argv[1],
  		    NULL);
  	}
  	exit(status);