diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2016-07-31 05:31:09 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2016-07-31 05:31:09 +0000 |
| commit | 637a1a744639d75fc88439cfeb59d973cfe73fa1 (patch) | |
| tree | 5b5cc8288450f33433827cd73e5c87fa44ae2096 /usr.bin/sed | |
| parent | 5467ab90aa75bbdefacee814de0314c1ae1bf5ae (diff) | |
| download | src-637a1a744639d75fc88439cfeb59d973cfe73fa1.tar.gz src-637a1a744639d75fc88439cfeb59d973cfe73fa1.zip | |
Fix regression with /i caused by r303047
'\n' was specifically added to -e arguments prior to r303047. Restore
historical behavior which in turn fixes usr.sbin/etcupdate/preworld_test:main .
The fix is being committed to address the issue in the short term and may be
iterated upon as noted in bug 211399
Discussed with: mi, pfg
Differential Revision: https://reviews.freebsd.org/D7368
PR: 195929, 211399 [*]
MFC after: 18 days
X-MFC with: r303047
Reported by: Jenkins
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=303572
Diffstat (limited to 'usr.bin/sed')
| -rw-r--r-- | usr.bin/sed/main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.bin/sed/main.c b/usr.bin/sed/main.c index fb3eca89d800..39d720cbb483 100644 --- a/usr.bin/sed/main.c +++ b/usr.bin/sed/main.c @@ -123,6 +123,7 @@ static void usage(void); int main(int argc, char *argv[]) { + char *temp_arg; int c, fflag; (void) setlocale(LC_ALL, ""); @@ -145,7 +146,10 @@ main(int argc, char *argv[]) break; case 'e': eflag = 1; - add_compunit(CU_STRING, optarg); + asprintf(&temp_arg, "%s\n", optarg); + if (temp_arg == NULL) + errx(1, "Couldn't allocate temporary buffer"); + add_compunit(CU_STRING, temp_arg); break; case 'f': fflag = 1; |