===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/uname/uname.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/uname/uname.c	2015/01/16 06:40:13	1.13
--- src/usr.bin/uname/uname.c	2015/07/21 16:22:59	1.14
***************
*** 1,4 ****
! /*	$OpenBSD: uname.c,v 1.13 2015/01/16 06:40:13 deraadt Exp $	*/
  
  /*
   * Copyright (c) 1994 Winning Strategies, Inc.
--- 1,4 ----
! /*	$OpenBSD: uname.c,v 1.14 2015/07/21 16:22:59 jasper Exp $	*/
  
  /*
   * Copyright (c) 1994 Winning Strategies, Inc.
***************
*** 15,21 ****
   * 3. All advertising materials mentioning features or use of this software
   *    must display the following acknowledgement:
   *      This product includes software developed by Winning Strategies, Inc.
!  * 4. The name of Winning Strategies, Inc. may not be used to endorse or 
   *    promote products derived from this software without specific prior
   *    written permission.
   *
--- 15,21 ----
   * 3. All advertising materials mentioning features or use of this software
   *    must display the following acknowledgement:
   *      This product includes software developed by Winning Strategies, Inc.
!  * 4. The name of Winning Strategies, Inc. may not be used to endorse or
   *    promote products derived from this software without specific prior
   *    written permission.
   *
***************
*** 70,79 ****
  		case 'n':
  			print_mask |= PRINT_NODENAME;
  			break;
! 		case 'r': 
  			print_mask |= PRINT_RELEASE;
  			break;
! 		case 's': 
  			print_mask |= PRINT_SYSNAME;
  			break;
  		case 'v':
--- 70,79 ----
  		case 'n':
  			print_mask |= PRINT_NODENAME;
  			break;
! 		case 'r':
  			print_mask |= PRINT_RELEASE;
  			break;
! 		case 's':
  			print_mask |= PRINT_SYSNAME;
  			break;
  		case 'v':
***************
*** 87,93 ****
  			/* NOTREACHED */
  		}
  	}
! 	
  	if (optind != argc) {
  		usage();
  		/* NOTREACHED */
--- 87,93 ----
  			/* NOTREACHED */
  		}
  	}
! 
  	if (optind != argc) {
  		usage();
  		/* NOTREACHED */
***************
*** 125,131 ****
  	if (print_mask & PRINT_MACHINE_ARCH) {
  		if (space++) putchar(' ');
  		fputs(MACHINE_ARCH, stdout);
! 	}		
  	putchar('\n');
  
  	exit(0);
--- 125,131 ----
  	if (print_mask & PRINT_MACHINE_ARCH) {
  		if (space++) putchar(' ');
  		fputs(MACHINE_ARCH, stdout);
! 	}
  	putchar('\n');
  
  	exit(0);