===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/du/du.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/du/du.c	2005/04/17 12:27:23	1.18
--- src/usr.bin/du/du.c	2006/01/25 06:20:03	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: du.c,v 1.18 2005/04/17 12:27:23 jmc Exp $	*/
  /*	$NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: du.c,v 1.19 2006/01/25 06:20:03 tedu Exp $	*/
  /*	$NetBSD: du.c,v 1.11 1996/10/18 07:20:35 thorpej Exp $	*/
  
  /*
***************
*** 34,40 ****
   */
  
  #ifndef lint
! static char copyright[] =
  "@(#) Copyright (c) 1989, 1993, 1994\n\
  	The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
--- 34,40 ----
   */
  
  #ifndef lint
! static const char copyright[] =
  "@(#) Copyright (c) 1989, 1993, 1994\n\
  	The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
***************
*** 43,49 ****
  #if 0
  static char sccsid[] = "@(#)du.c	8.5 (Berkeley) 5/4/95";
  #else
! static char rcsid[] = "$OpenBSD: du.c,v 1.18 2005/04/17 12:27:23 jmc Exp $";
  #endif
  #endif /* not lint */
  
--- 43,49 ----
  #if 0
  static char sccsid[] = "@(#)du.c	8.5 (Berkeley) 5/4/95";
  #else
! static const char rcsid[] = "$OpenBSD: du.c,v 1.19 2006/01/25 06:20:03 tedu Exp $";
  #endif
  #endif /* not lint */
  
***************
*** 74,99 ****
  	long blocksize;
  	quad_t totalblocks;
  	int ftsoptions, listdirs, listfiles;
! 	int Hflag, Lflag, Pflag, aflag, cflag, hflag, kflag, sflag;
  	int ch, notused, rval;
  	char **save;
  
  	save = argv;
! 	Hflag = Lflag = Pflag = aflag = cflag = hflag = kflag = sflag = 0;
  	totalblocks = 0;
  	ftsoptions = FTS_PHYSICAL;
  	while ((ch = getopt(argc, argv, "HLPachksxr")) != -1)
  		switch (ch) {
  		case 'H':
  			Hflag = 1;
! 			Lflag = Pflag = 0;
  			break;
  		case 'L':
  			Lflag = 1;
! 			Hflag = Pflag = 0;
  			break;
  		case 'P':
- 			Pflag = 1;
  			Hflag = Lflag = 0;
  			break;
  		case 'a':
--- 74,98 ----
  	long blocksize;
  	quad_t totalblocks;
  	int ftsoptions, listdirs, listfiles;
! 	int Hflag, Lflag, aflag, cflag, hflag, kflag, sflag;
  	int ch, notused, rval;
  	char **save;
  
  	save = argv;
! 	Hflag = Lflag = aflag = cflag = hflag = kflag = sflag = 0;
  	totalblocks = 0;
  	ftsoptions = FTS_PHYSICAL;
  	while ((ch = getopt(argc, argv, "HLPachksxr")) != -1)
  		switch (ch) {
  		case 'H':
  			Hflag = 1;
! 			Lflag = 0;
  			break;
  		case 'L':
  			Lflag = 1;
! 			Hflag = 0;
  			break;
  		case 'P':
  			Hflag = Lflag = 0;
  			break;
  		case 'a':