Module Name: src
Committed By: christos
Date: Thu Apr 5 18:44:57 UTC 2018
Modified Files:
src/bin/ed: ed.1 main.c
Log Message:
add -S to disable ! commands.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/bin/ed/ed.1
cvs rdiff -u -r1.28 -r1.29 src/bin/ed/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/ed/ed.1
diff -u src/bin/ed/ed.1:1.31 src/bin/ed/ed.1:1.32
--- src/bin/ed/ed.1:1.31 Mon Jul 3 17:33:23 2017
+++ src/bin/ed/ed.1 Thu Apr 5 14:44:57 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ed.1,v 1.31 2017/07/03 21:33:23 wiz Exp $
+.\" $NetBSD: ed.1,v 1.32 2018/04/05 18:44:57 christos Exp $
.\" $OpenBSD: ed.1,v 1.42 2003/07/27 13:25:43 jmc Exp $
.\"
.\" Copyright (c) 1993 Andrew Moore, Talke Studio.
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd January 23, 2002
+.Dd April 23, 2002
.Dt ED 1
.Os
.Sh NAME
@@ -34,7 +34,7 @@
.Sh SYNOPSIS
.Nm
.Op Fl
-.Op Fl Esx
+.Op Fl ESsx
.Op Fl p Ar string
.Op Ar file
.Sh DESCRIPTION
@@ -130,6 +130,12 @@ option (deprecated).
.It Fl E
Enables the use of extended regular expressions instead of the basic
regular expressions that are normally used.
+.It Fl S
+Disables using of the
+.Dq !
+command (execuring a subshell).
+Intended to be used by batch jobs like
+.Xr patch 1 .
.It Fl p Ar string
Specifies a command prompt.
This may be toggled on and off with the
@@ -955,6 +961,7 @@ but any changes to the buffer are lost.
.Xr sed 1 ,
.Xr sh 1 ,
.Xr vi 1 ,
+.Xr patch 1 ,
.Xr regex 3
.Pp
USD:09-10
Index: src/bin/ed/main.c
diff -u src/bin/ed/main.c:1.28 src/bin/ed/main.c:1.29
--- src/bin/ed/main.c:1.28 Wed Mar 2 14:11:28 2016
+++ src/bin/ed/main.c Thu Apr 5 14:44:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $ */
+/* $NetBSD: main.c,v 1.29 2018/04/05 18:44:57 christos Exp $ */
/* main.c: This file contains the main control and user-interface routines
for the ed line editor. */
@@ -39,7 +39,7 @@ __COPYRIGHT(
#if 0
static char *rcsid = "@(#)main.c,v 1.1 1994/02/01 00:34:42 alm Exp";
#else
-__RCSID("$NetBSD: main.c,v 1.28 2016/03/02 19:11:28 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.29 2018/04/05 18:44:57 christos Exp $");
#endif
#endif /* not lint */
@@ -94,6 +94,7 @@ int mutex = 0; /* if set, signals set
int red = 0; /* if set, restrict shell/directory access */
int ere = 0; /* if set, use extended regexes */
int scripted = 0; /* if set, suppress diagnostics */
+int secure = 0; /* is set, ! is not allowed */
int sigflags = 0; /* if set, signals received while mutex set */
int sigactive = 0; /* if set, signal handlers are enabled */
@@ -105,7 +106,7 @@ const char *prompt; /* command-line pr
const char *dps = "*"; /* default command-line prompt */
-static const char usage[] = "Usage: %s [-] [-sxE] [-p string] [name]\n";
+static const char usage[] = "Usage: %s [-] [-ESsx] [-p string] [name]\n";
/* ed: line editor */
int
@@ -118,7 +119,7 @@ main(int ac, char *av[])
red = (n = strlen(argv[0])) > 2 && argv[0][n - 3] == 'r';
top:
- while ((c = getopt(argc, argv, "p:sxE")) != -1)
+ while ((c = getopt(argc, argv, "p:sxES")) != -1)
switch(c) {
case 'p': /* set prompt */
prompt = optarg;
@@ -137,6 +138,9 @@ top:
case 'E':
ere = REG_EXTENDED;
break;
+ case 'S': /* ! is not allowed */
+ secure = 1;
+ break;
default:
fprintf(stderr, usage, getprogname());
exit(1);
@@ -861,6 +865,10 @@ exec_command(void)
printf("%ld\n", addr_cnt ? second_addr : addr_last);
break;
case '!':
+ if (secure) {
+ seterrmsg("'!' not allowed");
+ return ERR;
+ }
if (addr_cnt > 0) {
seterrmsg("unexpected address");
return ERR;
