===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/dirname/dirname.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -c -r1.15 -r1.16
*** src/usr.bin/dirname/dirname.c	2015/10/09 01:37:07	1.15
--- src/usr.bin/dirname/dirname.c	2016/10/28 07:22:59	1.16
***************
*** 1,4 ****
! /*	$OpenBSD: dirname.c,v 1.15 2015/10/09 01:37:07 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
--- 1,4 ----
! /*	$OpenBSD: dirname.c,v 1.16 2016/10/28 07:22:59 schwarze Exp $	*/
  
  /*
   * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com>
***************
*** 18,29 ****
  
  #include <err.h>
  #include <libgen.h>
- #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
  
! void usage(void);
  
  int
  main(int argc, char *argv[])
--- 18,28 ----
  
  #include <err.h>
  #include <libgen.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
  
! static void __dead usage(void);
  
  int
  main(int argc, char *argv[])
***************
*** 31,38 ****
  	int ch;
  	char *dir;
  
- 	setlocale(LC_ALL, "");
- 
  	if (pledge("stdio", NULL) == -1)
  		err(1, "pledge");
  
--- 30,35 ----
***************
*** 51,62 ****
  	if ((dir = dirname(argv[0])) == NULL)
  		err(1, "%s", argv[0]);
  	puts(dir);
! 	exit(0);
  }
  
  extern char *__progname;
  
! void
  usage(void)
  {
  	(void)fprintf(stderr, "usage: %s pathname\n", __progname);
--- 48,59 ----
  	if ((dir = dirname(argv[0])) == NULL)
  		err(1, "%s", argv[0]);
  	puts(dir);
! 	return 0;
  }
  
  extern char *__progname;
  
! static void __dead
  usage(void)
  {
  	(void)fprintf(stderr, "usage: %s pathname\n", __progname);