From owner-svn-src-all@FreeBSD.ORG  Mon Dec  1 20:51:02 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A966B5F8;
 Mon,  1 Dec 2014 20:51:02 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 960BB67C;
 Mon,  1 Dec 2014 20:51:02 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB1Kp2pl050163;
 Mon, 1 Dec 2014 20:51:02 GMT (envelope-from delphij@FreeBSD.org)
Received: (from delphij@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB1Kp20Z050162;
 Mon, 1 Dec 2014 20:51:02 GMT (envelope-from delphij@FreeBSD.org)
Message-Id: <201412012051.sB1Kp20Z050162@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: delphij set sender to
 delphij@FreeBSD.org using -f
From: Xin LI <delphij@FreeBSD.org>
Date: Mon, 1 Dec 2014 20:51:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r275377 - head/sbin/sysctl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Dec 2014 20:51:02 -0000

Author: delphij
Date: Mon Dec  1 20:51:01 2014
New Revision: 275377
URL: https://svnweb.freebsd.org/changeset/base/275377

Log:
  Fix inverted logic introduced in r272154.
  
  Noticed by:	trasz
  MFC after:	2 weeks

Modified:
  head/sbin/sysctl/sysctl.c

Modified: head/sbin/sysctl/sysctl.c
==============================================================================
--- head/sbin/sysctl/sysctl.c	Mon Dec  1 19:48:23 2014	(r275376)
+++ head/sbin/sysctl/sysctl.c	Mon Dec  1 20:51:01 2014	(r275377)
@@ -679,15 +679,18 @@ strIKtoi(const char *str, char **endptrp
 	p = &str[len - 1];
 	if (*p == 'C' || *p == 'F') {
 		temp = strtof(str, endptrp);
-		if (*endptrp != str && *endptrp == p && errno != 0) {
+		if (*endptrp != str && *endptrp == p && errno == 0) {
 			if (*p == 'F')
 				temp = (temp - 32) * 5 / 9;
+			*endptrp = NULL;
 			return (temp * 10 + 2732);
 		}
 	} else {
 		kelv = (int)strtol(str, endptrp, 10);
-		if (*endptrp != str && *endptrp == p && errno != 0)
+		if (*endptrp != str && *endptrp == p && errno == 0) {
+			*endptrp = NULL;
 			return (kelv);
+		}
 	}
 
 	errno = ERANGE;