===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/env/env.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/env/env.c	2015/10/10 21:19:14	1.16
--- src/usr.bin/env/env.c	2016/10/28 07:22:59	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: env.c,v 1.16 2015/10/10 21:19:14 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1988, 1993, 1994
--- 1,4 ----
! /*	$OpenBSD: env.c,v 1.17 2016/10/28 07:22:59 schwarze Exp $	*/
  
  /*
   * Copyright (c) 1988, 1993, 1994
***************
*** 31,43 ****
  
  #include <err.h>
  #include <errno.h>
- #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
  
! __dead void usage(void);
  
  int
  main(int argc, char *argv[])
--- 31,42 ----
  
  #include <err.h>
  #include <errno.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
  
! static void __dead usage(void);
  
  int
  main(int argc, char *argv[])
***************
*** 47,54 ****
  	char **ep, *p;
  	int ch;
  
- 	setlocale(LC_ALL, "");
- 
  	if (pledge("stdio exec", NULL) == -1)
  		err(1, "pledge");
  
--- 46,51 ----
***************
*** 86,95 ****
  	for (ep = environ; *ep; ep++)
  		(void)printf("%s\n", *ep);
  
! 	exit(0);
  }
  
! void
  usage(void)
  {
  	extern char *__progname;
--- 83,92 ----
  	for (ep = environ; *ep; ep++)
  		(void)printf("%s\n", *ep);
  
! 	return 0;
  }
  
! static void __dead
  usage(void)
  {
  	extern char *__progname;