From owner-svn-src-head@FreeBSD.ORG  Wed Nov 20 01:42:30 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id AC630B44;
 Wed, 20 Nov 2013 01:42:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 9B8222C8C;
 Wed, 20 Nov 2013 01:42:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAK1gUka069101;
 Wed, 20 Nov 2013 01:42:30 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Received: (from jhibbits@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAK1gU83069098;
 Wed, 20 Nov 2013 01:42:30 GMT
 (envelope-from jhibbits@svn.freebsd.org)
Message-Id: <201311200142.rAK1gU83069098@svn.freebsd.org>
From: Justin Hibbits <jhibbits@FreeBSD.org>
Date: Wed, 20 Nov 2013 01:42:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r258362 - in head/cddl/contrib/opensolaris/cmd: plockstat
 zfs
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.16
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Nov 2013 01:42:30 -0000

Author: jhibbits
Date: Wed Nov 20 01:42:29 2013
New Revision: 258362
URL: http://svnweb.freebsd.org/changeset/base/258362

Log:
  Use 'int' to store the return value of getopt(), rather than char.
  
  On some architectures (powerpc), char is unsigned by default, which means
  comparisons against -1 always fail, so the programs get stuck in an
  infinite loop.
  
  MFC after:	1 week

Modified:
  head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
  head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c

Modified: head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Wed Nov 20 01:33:13 2013	(r258361)
+++ head/cddl/contrib/opensolaris/cmd/plockstat/plockstat.c	Wed Nov 20 01:42:29 2013	(r258362)
@@ -778,7 +778,8 @@ main(int argc, char **argv)
 #endif
 	int err;
 	int opt_C = 0, opt_H = 0, opt_p = 0, opt_v = 0;
-	char c, *p, *end;
+	int c;
+	char *p, *end;
 	struct sigaction act;
 	int done = 0;
 

Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
==============================================================================
--- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Nov 20 01:33:13 2013	(r258361)
+++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Wed Nov 20 01:42:29 2013	(r258362)
@@ -2011,7 +2011,7 @@ zfs_do_upgrade(int argc, char **argv)
 	boolean_t showversions = B_FALSE;
 	int ret = 0;
 	upgrade_cbdata_t cb = { 0 };
-	char c;
+	int c;
 	int flags = ZFS_ITER_ARGS_CAN_BE_PATHS;
 
 	/* check options */
@@ -3561,7 +3561,7 @@ static int
 zfs_do_snapshot(int argc, char **argv)
 {
 	int ret = 0;
-	char c;
+	int c;
 	nvlist_t *props;
 	snap_cbdata_t sd = { 0 };
 	boolean_t multiple_snaps = B_FALSE;