From owner-svn-src-head@freebsd.org  Thu Apr 12 17:16:14 2018
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 288B4FA51B0;
 Thu, 12 Apr 2018 17:16:14 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CC8957A0DA;
 Thu, 12 Apr 2018 17:16:13 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C529063B9;
 Thu, 12 Apr 2018 17:16:13 +0000 (UTC)
 (envelope-from benno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3CHGD2r034588;
 Thu, 12 Apr 2018 17:16:13 GMT (envelope-from benno@FreeBSD.org)
Received: (from benno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3CHGDcC034587;
 Thu, 12 Apr 2018 17:16:13 GMT (envelope-from benno@FreeBSD.org)
Message-Id: <201804121716.w3CHGDcC034587@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: benno set sender to
 benno@FreeBSD.org using -f
From: Benno Rice <benno@FreeBSD.org>
Date: Thu, 12 Apr 2018 17:16:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r332440 - head/usr.bin/mkimg
X-SVN-Group: head
X-SVN-Commit-Author: benno
X-SVN-Commit-Paths: head/usr.bin/mkimg
X-SVN-Commit-Revision: 332440
X-SVN-Commit-Repository: base
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.25
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 12 Apr 2018 17:16:14 -0000

Author: benno
Date: Thu Apr 12 17:16:13 2018
New Revision: 332440
URL: https://svnweb.freebsd.org/changeset/base/332440

Log:
  Fix a conditional that got mucked up.
  
  Sponsored by:	iXsystems, Inc.

Modified:
  head/usr.bin/mkimg/mkimg.c

Modified: head/usr.bin/mkimg/mkimg.c
==============================================================================
--- head/usr.bin/mkimg/mkimg.c	Thu Apr 12 17:05:27 2018	(r332439)
+++ head/usr.bin/mkimg/mkimg.c	Thu Apr 12 17:16:13 2018	(r332440)
@@ -464,10 +464,10 @@ mkimg(void)
 			if (expand_number(size, &bytesize) == -1)
 				error = errno;
 			if (offset != NULL) {
-				if (*offset != '+') {
+				if (*offset != '+')
 					abs_offset = true;
+				else
 					offset++;
-				}
 				if (expand_number(offset, &byteoffset) == -1)
 					error = errno;
 			}