From a23f266994cf502199943e721c479b72a710b354 Mon Sep 17 00:00:00 2001 From: deraadt Date: Sun, 20 Apr 2014 09:29:36 +0000 Subject: [PATCH] Remove more commentary about recently removed des support from Daniel Dickman --- bin/ed/POSIX | 17 ++++------------- bin/ed/README | 5 ++--- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/bin/ed/POSIX b/bin/ed/POSIX index 227f9e752f9..d0e73428504 100644 --- a/bin/ed/POSIX +++ b/bin/ed/POSIX @@ -1,4 +1,4 @@ -$OpenBSD: POSIX,v 1.6 2014/01/01 16:17:55 tobias Exp $ +$OpenBSD: POSIX,v 1.7 2014/04/20 09:29:36 deraadt Exp $ $NetBSD: POSIX,v 1.9 1995/03/21 09:04:32 cgd Exp $ This version of ed(1) is not strictly POSIX compliant, as described in @@ -28,29 +28,20 @@ EXTENSIONS iv) `z' for scrolling through the buffer, and v) BSD line addressing syntax (i.e., `^' and `%') is recognized. -2) If crypt(3) is available, files can be read and written using DES - encryption. The `x' command prompts the user to enter a key used for - encrypting/decrypting subsequent reads and writes. If only a newline - is entered as the key, then encryption is disabled. Otherwise, a key - is read in the same manner as a password entry. The key remains in - effect until encryption is disabled. For more information on the - encryption algorithm, see the bdes(1) man page. Encryption/decryption - should be fully compatible with SunOS des(1). - -3) The POSIX interactive global commands `G' and `V' are extended to +2) The POSIX interactive global commands `G' and `V' are extended to support multiple commands, including `a', `i' and `c'. The command format is the same as for the global commands `g' and `v', i.e., one command per line with each line, except for the last, ending in a backslash (\). -4) An extension to the POSIX file commands `E', `e', `r', `W' and `w' is +3) An extension to the POSIX file commands `E', `e', `r', `W' and `w' is that arguments are processed for backslash escapes, i.e., any character preceded by a backslash is interpreted literally. If the first unescaped character of a argument is a bang (!), then the rest of the line is interpreted as a shell command, and no escape processing is performed by ed. -5) For SunOS ed(1) compatibility, ed runs in restricted mode if invoked +4) For SunOS ed(1) compatibility, ed runs in restricted mode if invoked as red. This limits editing of files in the local directory only and prohibits shell commands. diff --git a/bin/ed/README b/bin/ed/README index b389bf7af5d..7a5ac50cac1 100644 --- a/bin/ed/README +++ b/bin/ed/README @@ -1,4 +1,4 @@ -$OpenBSD: README,v 1.3 2014/02/24 13:28:40 millert Exp $ +$OpenBSD: README,v 1.4 2014/04/20 09:29:36 deraadt Exp $ $NetBSD: README,v 1.9 1995/03/21 09:04:33 cgd Exp $ ed is an 8-bit-clean, POSIX-compliant line editor. It should work with @@ -9,8 +9,7 @@ If reliable signals are supported (e.g., POSIX sigaction(2)), it should compile with little trouble. Otherwise, the macros SPL1() and SPL0() should be redefined to disable interrupts. -The following compiler directives are recognized: -DES - to add encryption support (requires crypt(3)) +The following compiler directive is recognized: BACKWARDS - for backwards compatibility The file `POSIX' describes extensions to and deviations from the POSIX -- 2.20.1