diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-05-27 01:19:58 +0000 |
| commit | 98e0ffaefb0f241cda3a72395d3be04192ae0d47 (patch) | |
| tree | 55c065b6730aaac2afb6c29933ee6ec5fa4c4249 /bin/ed | |
| parent | b17ff922d4072ae132ece458f5b5d74a236880ac (diff) | |
| parent | e81032ad243db32b8fd615b2d55ee94b9f6a5b6a (diff) | |
| download | src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.tar.gz src-test-98e0ffaefb0f241cda3a72395d3be04192ae0d47.zip | |
Merge sync of head
Notes
Notes:
svn path=/projects/bmake/; revision=283595
Diffstat (limited to 'bin/ed')
| -rw-r--r-- | bin/ed/Makefile | 3 | ||||
| -rw-r--r-- | bin/ed/ed.1 | 2 | ||||
| -rw-r--r-- | bin/ed/glbl.c | 4 |
3 files changed, 4 insertions, 5 deletions
diff --git a/bin/ed/Makefile b/bin/ed/Makefile index cc47a4271e924..bef3ff1ad5ef6 100644 --- a/bin/ed/Makefile +++ b/bin/ed/Makefile @@ -9,8 +9,7 @@ MLINKS= ed.1 red.1 .if ${MK_OPENSSL} != "no" && ${MK_ED_CRYPTO} != "no" CFLAGS+=-DDES -DPADD= ${LIBCRYPTO} -LDADD= -lcrypto +LIBADD= crypto .endif .include <bsd.prog.mk> diff --git a/bin/ed/ed.1 b/bin/ed/ed.1 index 8342645997c94..335dbd80ac7d4 100644 --- a/bin/ed/ed.1 +++ b/bin/ed/ed.1 @@ -738,7 +738,7 @@ It is an error if no substitutions are performed on any of the addressed lines. The current address is set the last line affected. .Pp -.Ar Re +.Ar \&Re and .Ar replacement may be delimited by any character other than space and newline diff --git a/bin/ed/glbl.c b/bin/ed/glbl.c index 5524700983e8a..dfb44d28ca0d9 100644 --- a/bin/ed/glbl.c +++ b/bin/ed/glbl.c @@ -60,7 +60,7 @@ build_active_list(int isgcmd) return ERR; if (isbinary) NUL_TO_NEWLINE(s, lp->len); - if (!regexec(pat, s, 0, NULL, 0) == isgcmd && + if (!(regexec(pat, s, 0, NULL, 0) == isgcmd) && set_active_node(lp) < 0) return ERR; } @@ -153,7 +153,7 @@ set_active_node(line_t *lp) if (active_list != NULL) { #endif if ((ts = (line_t **) realloc(active_list, - (ti += MINBUFSZ) * sizeof(line_t **))) == NULL) { + (ti += MINBUFSZ) * sizeof(line_t *))) == NULL) { fprintf(stderr, "%s\n", strerror(errno)); errmsg = "out of memory"; SPL0(); |