head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.12 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.8 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.6 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.4 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.2 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.2.0.8 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.6 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.4 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.2 pkgsrc-2008Q1:1.1.1.1.0.34 pkgsrc-2008Q1-base:1.1.1.1 pkgsrc-2007Q4:1.1.1.1.0.32 pkgsrc-2007Q4-base:1.1.1.1 pkgsrc-2007Q3:1.1.1.1.0.30 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.28 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.26 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.24 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.22 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.20 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.18 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.16 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.14 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.12 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.10 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-2004Q4:1.1.1.1.0.8 pkgsrc-2004Q4-base:1.1.1.1 pkgsrc-2004Q3:1.1.1.1.0.6 pkgsrc-2004Q3-base:1.1.1.1 pkgsrc-2004Q2:1.1.1.1.0.4 pkgsrc-2004Q2-base:1.1.1.1 pkgsrc-2004Q1:1.1.1.1.0.2 pkgsrc-2004Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.3 date 2008.11.04.14.27.37; author reed; state dead; branches; next 1.2; 1.2 date 2008.04.09.00.38.51; author reed; state Exp; branches 1.2.8.1; next 1.1; 1.1 date 2004.03.12.04.46.34; author reed; state Exp; branches 1.1.1.1; next ; 1.2.8.1 date 2008.11.05.10.19.17; author rtr; state dead; branches; next ; 1.1.1.1 date 2004.03.12.04.46.34; author reed; state Exp; branches; next ; desc @@ 1.3 log @Update to 1.1 This includes a security fix. From ChangeLog: 2008-10-14 Antonio Diaz * Version 1.1 released. * configure: Quote arguments stored in config.status. 2008-08-21 Antonio Diaz * Version 1.0 released. * configure: Added option `--program-prefix'. * signal.c (strip_escapes): Buffer overflow fixed. * signal.c (resize_buffer): Pointer aliasing warning fixed. @ text @$NetBSD: patch-aa,v 1.2 2008/04/09 00:38:51 reed Exp $ --- configure.orig 2008-02-24 13:10:42.000000000 -0600 +++ configure 2008-04-08 12:54:40.000000000 -0500 @@@@ -11,6 +11,7 @@@@ args=$* no_create= progname=ed +program_prefix= progversion=0.9 srctrigger=ed.h @@@@ -58,6 +59,7 @@@@ echo " --infodir=DIR info files directory [${infodir}]" echo " --mandir=DIR man pages directory [${mandir}]" echo " --sysconfdir=DIR read-only single-machine data directory [${sysconfdir}]" + echo " --program-prefix=NAME install program and documentation prefixed with NAME" echo " CC=COMPILER C compiler to use [gcc]" echo " CXX=COMPILER C++ compiler to use [g++]" echo " CPPFLAGS=OPTIONS command line options for the preprocessor [${CPPFLAGS}]" @@@@ -71,7 +73,7 @@@@ exit 0 ;; --srcdir* | --sr*) srcdir=`echo ${optarg} | sed -e 's,/$,,'` ;; - --prefix* | --pr*) + --prefix* | --pre*) prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; --exec-prefix* | --ex*) exec_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; @@@@ -85,6 +87,8 @@@@ mandir=`echo ${optarg} | sed -e 's,/$,,'` ;; --sysconfdir* | --sy*) sysconfdir=`echo ${optarg} | sed -e 's,/$,,'` ;; + --program-prefix* | --pro*) + program_prefix=`echo ${optarg} | sed -e 's,/$,,'` ;; --no-create | --no-c*) no_create=yes ;; @@@@ -188,6 +192,7 @@@@ # to copy, distribute and modify it. progname = ${progname} +program_prefix = ${program_prefix} progversion = ${progversion} VPATH = ${srcdir} prefix = ${prefix} @ 1.2 log @Update to ed-0.9. Both patches changed. I made new patches to support being able to install to program_prefix. (I supplied these upstream too.) From change log: 2008-02-24 Antonio Diaz * Version 0.9 released. * signal.c (sighup_handler): Return 0 if no error. * Arg_parser updated to 1.1. 2007-08-18 Antonio Diaz * Version 0.8 released. * check.sh: Testsuite exits unsuccesfully in case of error. * ed.1: Fixed some minor problems in the manual page. * ed.texinfo: Added 21kB of legalese (fdl.texinfo). 2007-07-18 Antonio Diaz * Version 0.7 released. * buf.c (dec_addr): Now returns correct address when wrapping. 2007-06-29 Antonio Diaz * Version 0.6 released. * License updated to GPL version 3 or later. * signal.c (sigwinch_handler, set_signal): Fixed two minor compatibility problems. * main_loop.c (main_loop): Fixed an infinite loop when reading an empty script. 2007-03-09 Antonio Diaz * Version 0.5 released. * main_loop.c (next_addr): '%' reimplemented as it was in ed 0.2. 2007-01-15 Antonio Diaz * Version 0.4 released. * Fixed some minor problems in the testsuite. 2006-11-11 Antonio Diaz * Version 0.3 released. * buf.c (open_sbuf): Fixed symlink vulnerability using standard function `tmpfile'. * signal.c: Fixed signal handling for SIGINT. * main_loop.c (exec_command): Fixed `c' and `i' commands with address 0. * The pause mode has been removed. * main.c: Added new options `--loose-exit-status' and `--verbose'. * carg_parser.c: New argument parser that replaces `getopt_long'. * `configure' and `Makefile.in' have been replaced. * Removed recursive make for testsuite. * Created directory `doc'. * Removed all pre ISO C89 code. * Removed all global variables. * ed.texinfo: Added to the manual the changes from Andrew and some mine. @ text @d1 1 a1 1 $NetBSD$ @ 1.2.8.1 log @pullup ticket #2575 - requested by reed ed: update package for security fix revisions pulled up: pkgsrc/editors/ed/Makefile 1.11 pkgsrc/editors/ed/distinfo 1.7 pkgsrc/editors/ed/patches/patch-aa r0 pkgsrc/editors/ed/patches/patch-ab r0 Module Name: pkgsrc Committed By: reed Date: Tue Nov 4 14:27:37 UTC 2008 Modified Files: pkgsrc/editors/ed: Makefile distinfo Removed Files: pkgsrc/editors/ed/patches: patch-aa patch-ab Log Message: Update to 1.1 This includes a security fix. From ChangeLog: 2008-10-14 Antonio Diaz * Version 1.1 released. * configure: Quote arguments stored in config.status. 2008-08-21 Antonio Diaz * Version 1.0 released. * configure: Added option `--program-prefix'. * signal.c (strip_escapes): Buffer overflow fixed. * signal.c (resize_buffer): Pointer aliasing warning fixed. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2008/04/09 00:38:51 reed Exp $ @ 1.1 log @Initial revision @ text @d3 44 a46 231 install-info: warning: no info dir entry in `/usr/pkg/info/ed.info' ed.texinfo:168: warning: `.' or `,' must follow cross reference, not a. ed.texinfo:477: warning: unlikely character , in @@var. ed.texinfo:478: warning: unlikely character , in @@var. --- ed.info.orig 2003-12-03 01:31:56.000000000 -0800 +++ ed.info @@@@ -1,5 +1,9 @@@@ -This is Info file ed.info, produced by Makeinfo-1.55 from the input -file ed.texinfo. +This is ed.info, produced by makeinfo version 4.6 from ed.texinfo. + +INFO-DIR-SECTION Text creation and manipulation +START-INFO-DIR-ENTRY +* Ed: (ed). Line editor. +END-INFO-DIR-ENTRY This file documents the `ed' command, which has the purpose of editing text files. @@@@ -25,8 +29,8 @@@@ File: ed.info, Node: Top, Next: Intro, - This info file documents the `ed' text editor, as of release 0.2. -You may find in this document: +This info file documents the `ed' text editor, as of release 0.2. You +may find in this document: * Menu: @@@@ -44,7 +48,7 @@@@ File: ed.info, Node: Intro, Next: Invo Intro ***** - `ed' is a line-oriented text editor. It is used to create, display, +`ed' is a line-oriented text editor. It is used to create, display, modify and otherwise manipulate text files, both interactively and via shell scripts. A restricted version of `ed', `red', can only edit files in the current directory and cannot execute shell commands. `ed' @@@@ -55,7 +59,7 @@@@ however, it is superceded by full-screen The sample sessions below illustrate some basic concepts of line editing with `ed'. We begin by creating a file, `sonnet', with some help from Shakespeare. As with the shell, all input to `ed' must be -followed by a newline character. Comments begin with a `#'. +followed by a character. Comments begin with a `#'. $ ed # The `a' command is for appending text to the editor buffer. @@@@ -84,8 +88,8 @@@@ the contents of the editor buffer. When mode. This is the primary means of adding text to a file. In this mode, no commands are available; instead, the standard input is written directly to the editor buffer. A "line" consists of the text up to and -including a newline character. Input mode is terminated by entering a -single period (`.') on a line. +including a character. Input mode is terminated by entering +a single period (`.') on a line. In the next example, some typos are corrected in the file `sonnet'. @@@@ -205,6 +209,7 @@@@ Invoking GNU `ed' try invoking `ed' with this switch. `-s' + `-' Suppresses diagnostics. This should be used if `ed''s standard input is from a script. @@@@ -213,6 +218,7 @@@@ Invoking GNU `ed' Specifies a command prompt. This may be toggled on and off with the `P' command. + FILE specifies the name of a file to read. If FILE is prefixed with a bang (!), then it is interpreted as a shell command. In this case, what is read is the standard output of FILE executed via `sh (1)'. To @@@@ -226,7 +232,7 @@@@ File: ed.info, Node: Line addressing, Line addressing *************** - An address represents the number of a line in the buffer. `ed' +An address represents the number of a line in the buffer. `ed' maintains a "current address" which is typically supplied to commands as the default address when none is specified. When a file is first read, the current address is set to the last line of the file. In @@@@ -308,14 +314,15 @@@@ interpreted relative to the first. The line previously marked by a `k' (mark) command, where LC is a lower case letter. +  File: ed.info, Node: Regular expressions, Next: Commands, Prev: Line addressing, Up: Top Regular expressions ******************* - Regular expressions are patterns used in selecting text. For -example, the `ed' command +Regular expressions are patterns used in selecting text. For example, +the `ed' command g/STRING/ @@@@ -396,8 +403,8 @@@@ left-most longest match is the one selec string `abbb', as opposed to the substring `bbb', since a null match is the only left-most match. -`\{N,M\}' -`\{N,\}' +`\{`n,m'\}' +`\{`n,'\}' `\{N\}' Matches the single character regular expression or subexpression immediately preceding it at least N and at most M times. If M is @@@@ -415,6 +422,7 @@@@ left-most longest match is the one selec maximal string of alphanumeric characters, including the underscore (_). + The following extended operators are preceded by a backslash `\' to distinguish them from traditional `ed' syntax. @@@@ -452,23 +460,23 @@@@ distinguish them from traditional `ed' s `\W' Matches any character not in a word. +  File: ed.info, Node: Commands, Next: Limitations, Prev: Regular expressions, Up: Top Commands ******** - All `ed' commands are single characters, though some require -additonal parameters. If a command's parameters extend over several -lines, then each line except for the last must be terminated with a -backslash (`\'). +All `ed' commands are single characters, though some require additonal +parameters. If a command's parameters extend over several lines, then +each line except for the last must be terminated with a backslash (`\'). In general, at most one command is allowed per line. However, most commands accept a print suffix, which is any of `p' (print), `l' (list), or `n' (enumerate), to print the last line affected by the command. - An interrupt (typically ^C) has the effect of aborting the current + An interrupt (typically <^C>) has the effect of aborting the current command and returning the editor to command mode. `ed' recognizes the following commands. The commands are shown @@@@ -563,7 +571,7 @@@@ specified (in parenthesis). `(.,.)l' Prints the addressed lines unambiguously. If invoked from a - terminal, `ed' pauses at the end of each page until a newline is + terminal, `ed' pauses at the end of each page until a is entered. The current address is set to the last line printed. `(.,.)m(.)' @@@@ -577,7 +585,7 @@@@ specified (in parenthesis). `(.,.)p' Prints the addressed lines. If invoked from a terminal, `ed' - pauses at the end of each page until a newline is entered. The + pauses at the end of each page until a is entered. The current address is set to the last line printed. `P' @@@@ -616,8 +624,8 @@@@ specified (in parenthesis). The current address is set the last line affected. RE and REPLACEMENT may be delimited by any character other than - space and newline (see the `s' command below). If one or two of - the last delimiters is omitted, then the last line affected is + and (see the `s' command below). If one or two + of the last delimiters is omitted, then the last line affected is printed as though the print suffix `p' were specified. An unescaped `&' in REPLACEMENT is replaced by the currently @@@@ -711,17 +719,18 @@@@ specified (in parenthesis). `($)=' Prints the line number of the addressed line. -`(.+1)newline' +`(.+1)' Prints the addressed line, and sets the current address to that line. +  File: ed.info, Node: Limitations, Next: Diagnostics, Prev: Commands, Up: Top Limitations *********** - The buffer files are kept in `/tmp/ed.*'. If the terminal hangs up, +The buffer files are kept in `/tmp/ed.*'. If the terminal hangs up, `ed' attempts to write the buffer to file `ed.hup'. `ed' processes FILE arguments for backslash escapes, i.e., in a @@@@ -740,7 +749,7 @@@@ File: ed.info, Node: Diagnostics, Prev Diagnostics *********** - When an error occurs, if `ed''s input is from a regular file or here +When an error occurs, if `ed''s input is from a regular file or here document, then it exits, otherwise it prints a `?' and returns to command mode. An explanation of the last error can be printed with the `h' (help) command. @@@@ -757,13 +766,13 @@@@ second time, it succeeds, but any change  Tag Table: -Node: Top894 -Node: Intro1524 -Node: Invoking ed7497 -Node: Line addressing8534 -Node: Regular expressions11590 -Node: Commands16976 -Node: Limitations27862 -Node: Diagnostics28480 +Node: Top1010 +Node: Intro1638 +Node: Invoking ed7612 +Node: Line addressing8651 +Node: Regular expressions11705 +Node: Commands17094 +Node: Limitations27990 +Node: Diagnostics28605  End Tag Table @ 1.1.1.1 log @Initial import of ed-0.2, the GNU version of line-oriented text editor. @ text @@