===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/arch/arch.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/arch/arch.c	1999/08/19 22:17:38	1.3
--- src/usr.bin/arch/arch.c	1999/08/20 09:20:39	1.4
***************
*** 29,43 ****
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: arch.c,v 1.3 1999/08/19 22:17:38 niklas Exp $";
  #endif /* not lint */
  
- #include <stdio.h>
- #include <locale.h>
- #include <unistd.h>
  #include <sys/param.h>
! #include <sys/utsname.h>
  #include <err.h>
  
  static void usage __P((void));
  
--- 29,43 ----
   */
  
  #ifndef lint
! static char rcsid[] = "$OpenBSD: arch.c,v 1.4 1999/08/20 09:20:39 millert Exp $";
  #endif /* not lint */
  
  #include <sys/param.h>
! 
  #include <err.h>
+ #include <locale.h>
+ #include <stdio.h>
+ #include <unistd.h>
  
  static void usage __P((void));
  
***************
*** 53,62 ****
  	char *opts;
  	int c;
  	int short_form = 0;
  
  	setlocale(LC_ALL, "");
  
! 	machine = strcmp (argv[0], "machine") == 0;
  	if (machine) {
  		arch = MACHINE;
  		opts = "a";
--- 53,63 ----
  	char *opts;
  	int c;
  	int short_form = 0;
+ 	extern char *__progname;
  
  	setlocale(LC_ALL, "");
  
! 	machine = strcmp(__progname, "machine") == 0;
  	if (machine) {
  		arch = MACHINE;
  		opts = "a";
***************
*** 78,84 ****
  				break;
  			default:
  				usage();
! 				/* NOTREASCHED */
  		}
  	if (optind != argc) {
  		usage();
--- 79,85 ----
  				break;
  			default:
  				usage();
! 				/* NOTREACHED */
  		}
  	if (optind != argc) {
  		usage();