diff options
| author | peter <peter@FreeBSD.org> | 1996-09-03 14:16:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-09-03 14:16:06 +0000 |
| commit | 0475c084c22d974adb50e049f8526e7ba3325c20 (patch) | |
| tree | 813be7fe988c4549d7c49e07f8aa26f6bed0c68a /bin/sh/memalloc.c | |
| parent | 46c0540195d8219fc18878aaf2e8f89c0c6778dc (diff) | |
| download | FreeBSD-src-0475c084c22d974adb50e049f8526e7ba3325c20.zip FreeBSD-src-0475c084c22d974adb50e049f8526e7ba3325c20.tar.gz | |
Fix for PR#1287. This makes sh behave sensibly in case statements in the
face of aliases. Note, bash doesn't do aliases while running scripts, but
"real" ksh does..
Also:
Reduce redundant .Nm macros in (unused) bltin/echo.1
nuke error2, it's hardly used.
More -Wall cleanups
dont do certain history operations if NO_HISTORY defined
handle quad_t's from resource limits
Submitted by: Steve Price <sprice@hiwaay.net> (minor tweaks by me)
Diffstat (limited to 'bin/sh/memalloc.c')
| -rw-r--r-- | bin/sh/memalloc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/sh/memalloc.c b/bin/sh/memalloc.c index 38b32a9..adaf1fe 100644 --- a/bin/sh/memalloc.c +++ b/bin/sh/memalloc.c @@ -33,7 +33,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: memalloc.c,v 1.2 1994/09/24 02:57:50 davidg Exp $ + * $Id: memalloc.c,v 1.3 1996/09/01 10:20:42 peter Exp $ */ #ifndef lint @@ -207,7 +207,7 @@ popstackmark(mark) void growstackblock() { char *p; - int newlen = stacknleft * 2 + 100; + int newlen = ALIGN(stacknleft * 2 + 100); char *oldspace = stacknxt; int oldlen = stacknleft; struct stack_block *sp; @@ -226,7 +226,7 @@ growstackblock() { p = stalloc(newlen); memcpy(p, oldspace, oldlen); stacknxt = p; /* free the space */ - stacknleft += ALIGN(newlen); /* we just allocated */ + stacknleft += newlen; /* we just allocated */ } } |
