summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2011-05-15 22:09:27 +0000
committerjilles <jilles@FreeBSD.org>2011-05-15 22:09:27 +0000
commit14adb603eff500741284c8ad2aadfdcec9598d91 (patch)
treec522d3db8b6c01d976c4aa0fed250844616ca13b
parent092240b113c0b5cc26c8d7533270d362bfc24e6c (diff)
downloadFreeBSD-src-14adb603eff500741284c8ad2aadfdcec9598d91.zip
FreeBSD-src-14adb603eff500741284c8ad2aadfdcec9598d91.tar.gz
sh: Minor optimization to output from ulimit/export/readonly.
No functional change is intended.
-rw-r--r--bin/sh/miscbltin.c4
-rw-r--r--bin/sh/var.c11
2 files changed, 7 insertions, 8 deletions
diff --git a/bin/sh/miscbltin.c b/bin/sh/miscbltin.c
index dc200b6..fce13b5 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 84b6dea..f6d7fb1 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');
}
OpenPOWER on IntegriCloud