===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/expand/expand.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/expand/expand.c	2003/07/03 03:09:39	1.7
--- src/usr.bin/expand/expand.c	2004/07/01 19:15:56	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: expand.c,v 1.7 2003/07/03 03:09:39 deraadt Exp $	*/
  /*	$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $	*/
  
  /*
--- 1,4 ----
! /*	$OpenBSD: expand.c,v 1.8 2004/07/01 19:15:56 mickey Exp $	*/
  /*	$NetBSD: expand.c,v 1.5 1995/09/02 06:19:46 jtc Exp $	*/
  
  /*
***************
*** 31,52 ****
   */
  
  #ifndef lint
! static char copyright[] =
  "@(#) Copyright (c) 1980, 1993\n\
  	The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
  #if 0
! static char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
  #endif
! static char rcsid[] = "$OpenBSD: expand.c,v 1.7 2003/07/03 03:09:39 deraadt Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <ctype.h>
  #include <unistd.h>
  
  /*
   * expand - expand tabs to equivalent spaces
--- 31,53 ----
   */
  
  #ifndef lint
! static const char copyright[] =
  "@(#) Copyright (c) 1980, 1993\n\
  	The Regents of the University of California.  All rights reserved.\n";
  #endif /* not lint */
  
  #ifndef lint
  #if 0
! static const char sccsid[] = "@(#)expand.c	8.1 (Berkeley) 6/9/93";
  #endif
! static const char rcsid[] = "$OpenBSD: expand.c,v 1.8 2004/07/01 19:15:56 mickey Exp $";
  #endif /* not lint */
  
  #include <stdio.h>
  #include <stdlib.h>
  #include <ctype.h>
  #include <unistd.h>
+ #include <err.h>
  
  /*
   * expand - expand tabs to equivalent spaces
***************
*** 85,94 ****
  
  	do {
  		if (argc > 0) {
! 			if (freopen(argv[0], "r", stdin) == NULL) {
! 				perror(argv[0]);
! 				exit(1);
! 			}
  			argc--, argv++;
  		}
  		column = 0;
--- 86,93 ----
  
  	do {
  		if (argc > 0) {
! 			if (freopen(argv[0], "r", stdin) == NULL)
! 				err(1, argv[0]);
  			argc--, argv++;
  		}
  		column = 0;
***************
*** 157,164 ****
  			i = i * 10 + *cp++ - '0';
  		if (i <= 0 || i > 256) {
  bad:
! 			fprintf(stderr, "Bad tab stop spec\n");
! 			exit(1);
  		}
  		if (nstops > 0 && i <= tabstops[nstops-1])
  			goto bad;
--- 156,162 ----
  			i = i * 10 + *cp++ - '0';
  		if (i <= 0 || i > 256) {
  bad:
! 			errx(1, "Bad tab stop spec");
  		}
  		if (nstops > 0 && i <= tabstops[nstops-1])
  			goto bad;
***************
*** 174,179 ****
  static void
  usage(void)
  {
! 	(void)fprintf (stderr, "usage: expand [-t tablist] [file ...]\n");
  	exit(1);
  }
--- 172,178 ----
  static void
  usage(void)
  {
! 	extern char *__progname;
! 	fprintf (stderr, "usage: %s [-t tablist] [file ...]\n", __progname);
  	exit(1);
  }