From owner-svn-src-head@FreeBSD.ORG  Sun May 15 22:09:28 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D5E2106566B;
	Sun, 15 May 2011 22:09:28 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D6F58FC13;
	Sun, 15 May 2011 22:09:28 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p4FM9SX1054639;
	Sun, 15 May 2011 22:09:28 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p4FM9SmN054636;
	Sun, 15 May 2011 22:09:28 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201105152209.p4FM9SmN054636@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 15 May 2011 22:09:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r221975 - head/bin/sh
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sun, 15 May 2011 22:09:28 -0000

Author: jilles
Date: Sun May 15 22:09:27 2011
New Revision: 221975
URL: http://svn.freebsd.org/changeset/base/221975

Log:
  sh: Minor optimization to output from ulimit/export/readonly.
  
  No functional change is intended.

Modified:
  head/bin/sh/miscbltin.c
  head/bin/sh/var.c

Modified: head/bin/sh/miscbltin.c
==============================================================================
--- head/bin/sh/miscbltin.c	Sun May 15 21:44:51 2011	(r221974)
+++ head/bin/sh/miscbltin.c	Sun May 15 22:09:27 2011	(r221975)
@@ -465,7 +465,7 @@ ulimitcmd(int argc __unused, char **argv
 					"(-%c) ", l->option);
 			out1fmt("%-18s %18s ", l->name, optbuf);
 			if (val == RLIM_INFINITY)
-				out1fmt("unlimited\n");
+				out1str("unlimited\n");
 			else
 			{
 				val /= l->factor;
@@ -491,7 +491,7 @@ ulimitcmd(int argc __unused, char **argv
 			val = limit.rlim_max;
 
 		if (val == RLIM_INFINITY)
-			out1fmt("unlimited\n");
+			out1str("unlimited\n");
 		else
 		{
 			val /= l->factor;

Modified: head/bin/sh/var.c
==============================================================================
--- head/bin/sh/var.c	Sun May 15 21:44:51 2011	(r221974)
+++ head/bin/sh/var.c	Sun May 15 22:09:27 2011	(r221975)
@@ -681,14 +681,13 @@ exportcmd(int argc, char **argv)
 						out1str(cmdname);
 						out1c(' ');
 					}
-					p = strchr(vp->text, '=');
 					if (values && !(vp->flags & VUNSET)) {
-						p++;
-						outbin(vp->text, p - vp->text,
-						    out1);
-						out1qstr(p);
+						outbin(vp->text,
+						    vp->name_len + 1, out1);
+						out1qstr(vp->text +
+						    vp->name_len + 1);
 					} else
-						outbin(vp->text, p - vp->text,
+						outbin(vp->text, vp->name_len,
 						    out1);
 					out1c('\n');
 				}