===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uname/uname.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -c -r1.18 -r1.19
*** src/usr.bin/uname/uname.c	2016/10/10 02:23:54	1.18
--- src/usr.bin/uname/uname.c	2016/10/28 07:22:59	1.19
***************
*** 1,4 ****
! /*	$OpenBSD: uname.c,v 1.18 2016/10/10 02:23:54 gsoares Exp $	*/
  
  /*
   * Copyright (c) 1994 Winning Strategies, Inc.
--- 1,4 ----
! /*	$OpenBSD: uname.c,v 1.19 2016/10/28 07:22:59 schwarze Exp $	*/
  
  /*
   * Copyright (c) 1994 Winning Strategies, Inc.
***************
*** 35,46 ****
  #include <sys/utsname.h>
  
  #include <err.h>
- #include <locale.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
  
! static void usage(void);
  
  #define	PRINT_SYSNAME		0x01
  #define	PRINT_NODENAME		0x02
--- 35,45 ----
  #include <sys/utsname.h>
  
  #include <err.h>
  #include <stdio.h>
  #include <stdlib.h>
  #include <unistd.h>
  
! static void __dead usage(void);
  
  #define	PRINT_SYSNAME		0x01
  #define	PRINT_NODENAME		0x02
***************
*** 58,65 ****
  	int space = 0;
  	int print_mask = 0;
  
- 	setlocale(LC_ALL, "");
- 
  	if (pledge("stdio", NULL) == -1)
  		err(1, "pledge");
  
--- 57,62 ----
***************
*** 88,105 ****
  			break;
  		default:
  			usage();
- 			/* NOTREACHED */
  		}
  	}
  
! 	if (optind != argc) {
  		usage();
- 		/* NOTREACHED */
- 	}
  
! 	if (!print_mask) {
  		print_mask = PRINT_SYSNAME;
- 	}
  
  	if (uname(&u) == -1)
  		err(1, NULL);
--- 85,98 ----
  			break;
  		default:
  			usage();
  		}
  	}
  
! 	if (optind != argc)
  		usage();
  
! 	if (!print_mask)
  		print_mask = PRINT_SYSNAME;
  
  	if (uname(&u) == -1)
  		err(1, NULL);
***************
*** 143,149 ****
  	return 0;
  }
  
! static void
  usage(void)
  {
  	fprintf(stderr, "usage: uname [-amnprsv]\n");
--- 136,142 ----
  	return 0;
  }
  
! static void __dead
  usage(void)
  {
  	fprintf(stderr, "usage: uname [-amnprsv]\n");