d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Instead of eating trailing newlines after inserting them into the

Browse Source 
output buffer, don't insert them at all.  This prevents a buffer
*underrun* when the substitution consists completely of newlines
(e.g. `echo`) and the byte before the source buffer to which p
points is a '\n', in which case more characters would be removed
from the output buffer than were inserted.

This fixes certain port builds on sparc64.

Approved by:	re (scottl)
Reviewed by:	des, tjr
This commit is contained in:
Bill Fenner 2003-05-31 06:27:57 +00:00
parent 832bb1e2d0
commit 99907703d9
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=115424
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/sh/expand.c
View File

@ -437,6 +437,7 @@ expbackq(union node *cmd, int quoted, int flag)
char const *syntax = quoted? DQSYNTAX : BASESYNTAX;
int saveherefd;
int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR);
int nnl;
INTOFF;
saveifs = ifsfirst;
@ -454,6 +455,8 @@ expbackq(union node *cmd, int quoted, int flag)
p = in.buf;
lastc = '\0';
nnl = 0;
/* Don't copy trailing newlines */
for (;;) {
if (--in.nleft < 0) {
if (in.fd < 0)
@ -469,14 +472,18 @@ expbackq(union node *cmd, int quoted, int flag)
if (lastc != '\0') {
if (quotes && syntax[(int)lastc] == CCTL)
STPUTC(CTLESC, dest);
STPUTC(lastc, dest);
if (lastc == '\n') {
nnl++;
} else {
while (nnl > 0) {
nnl--;
STPUTC('\n', dest);
}
STPUTC(lastc, dest);
}
}
}
/* Eat all trailing newlines */
for (p--; lastc == '\n'; lastc = *--p)
STUNPUTC(dest);
if (in.fd >= 0)
close(in.fd);
if (in.buf)