From 258ef734e711e866a0030c182643c873a5e53930 Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 15 May 2011 22:09:27 +0000
Subject: [PATCH] sh: Minor optimization to output from ulimit/export/readonly.

No functional change is intended.
---
 bin/sh/miscbltin.c |  4 ++--
 bin/sh/var.c       | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index dc200b6d566e..fce13b5c147d 100644
--- a/bin/sh/miscbltin.c
+++ b/bin/sh/miscbltin.c
@@ -465,7 +465,7 @@ ulimitcmd(int argc __unused, char **argv __unused)
 					"(-%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 __unused)
 			val = limit.rlim_max;
 
 		if (val == RLIM_INFINITY)
-			out1fmt("unlimited\n");
+			out1str("unlimited\n");
 		else
 		{
 			val /= l->factor;
diff --git a/bin/sh/var.c b/bin/sh/var.c
index 84b6dea66d4c..f6d7fb1c1aa0 100644
--- a/bin/sh/var.c
+++ b/bin/sh/var.c
@@ -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');
 				}