===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/diff/diffreg.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/diff/diffreg.c	2003/07/22 00:15:55	1.39
--- src/usr.bin/diff/diffreg.c	2003/07/22 00:20:40	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: diffreg.c,v 1.39 2003/07/22 00:15:55 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diffreg.c,v 1.40 2003/07/22 00:20:40 millert Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 65,71 ****
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.39 2003/07/22 00:15:55 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
--- 65,71 ----
   */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diffreg.c,v 1.40 2003/07/22 00:20:40 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
***************
*** 76,82 ****
  #include <err.h>
  #include <errno.h>
  #include <fcntl.h>
- #include <libgen.h>
  #include <stddef.h>
  #include <stdio.h>
  #include <stdlib.h>
--- 76,81 ----
***************
*** 397,411 ****
  			rewind(stdout);
  			free(header);
  		}
! 	} else {
! 		if (flags & D_HEADER) {
! 			if (format == D_EDIT)
! 				printf("ed - %s << '-*-END-*-'\n",
! 				    basename(file1));
! 			else
! 				printf("%s %s %s\n", diffargs, file1, file2);
! 		}
! 	}
  	prepare(0, f1);
  	prepare(1, f2);
  	prune();
--- 396,403 ----
  			rewind(stdout);
  			free(header);
  		}
! 	} else if (flags & D_HEADER)
! 		printf("%s %s %s\n", diffargs, file1, file2);
  	prepare(0, f1);
  	prepare(1, f2);
  	prune();
***************
*** 447,454 ****
  			close(ostdout);
  		}
  		waitpid(pid, &wstatus, 0);
! 	} else if ((flags & D_HEADER) && format == D_EDIT)
! 		printf("w\nq\n-*-END-*-\n");
  closem:
  	if (f1 != NULL)
  		fclose(f1);
--- 439,445 ----
  			close(ostdout);
  		}
  		waitpid(pid, &wstatus, 0);
! 	}
  closem:
  	if (f1 != NULL)
  		fclose(f1);