It took a while longer than I'd planned, but I've gone through and redone my patches. I found a second source of an infinite loop to do with joining where a variable would be -1 and the counter started at 0, so could never equal it. I also added a safety guard on j to prevent someone passing it a 0 address, which would cause a segfault.
Hopefully all's in order and my editor saved with tabs this time. Thanks, Thomas -- Thomas Mannay <audiobarr...@openmailbox.org>
>From e27ecb4eaf04fcec871c4eb5319f1c14bc151d3d Mon Sep 17 00:00:00 2001 From: Thomas Mannay <audiobarr...@openmailbox.org> Date: Sun, 9 Oct 2016 23:10:20 +0000 Subject: [PATCH 1/5] ed: remove infinite loops in join() and getindex() --- ed.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ed.c b/ed.c index 184ed30..f552234 100644 --- a/ed.c +++ b/ed.c @@ -192,7 +192,9 @@ getindex(int line) struct hline *lp; int n; - for (n = 0, lp = zero; n != line; ++n) + if (line == -1) + line = 0; + for (n = 0, lp = zero; n != line; n++) lp = zero + lp->next; return lp - zero; @@ -806,9 +808,11 @@ join(void) static char *s; free(s); - for (s = NULL, i = line1; i <= line2; i = nextln(i)) { + for (s = NULL, i = line1;; i = nextln(i)) { for (t = gettxt(i); (c = *t) != '\n'; ++t) s = addchar(*t, s, &cap, &len); + if (i == line2) + break; } s = addchar('\n', s, &cap, &len); -- 2.10.0
>From 5069287a04fb182e83269b86b95f01169ae36233 Mon Sep 17 00:00:00 2001 From: Thomas Mannay <audiobarr...@openmailbox.org> Date: Sun, 9 Oct 2016 23:11:01 +0000 Subject: [PATCH 2/5] ed: giving j only one address does nothing --- ed.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ed.c b/ed.c index f552234..4ab40bc 100644 --- a/ed.c +++ b/ed.c @@ -1174,9 +1174,8 @@ repeat: case 'j': chkprint(1); deflines(curln, curln+1); - if (!line1) - goto bad_address; - join(); + if (line1 != line2 && curln != 0) + join(); break; case 'z': if (nlines > 1) -- 2.10.0
>From 90f8b32b4dac7553882fce39094a338a399a1d44 Mon Sep 17 00:00:00 2001 From: Thomas Mannay <audiobarr...@openmailbox.org> Date: Sun, 9 Oct 2016 23:12:46 +0000 Subject: [PATCH 3/5] ed: place newly joined lines correctly --- ed.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/ed.c b/ed.c index 4ab40bc..d123814 100644 --- a/ed.c +++ b/ed.c @@ -299,13 +299,17 @@ undo(void) } static void -inject(char *s) +inject(char *s, int j) { int off, k, begin, end; - begin = getindex(curln); - end = getindex(nextln(curln)); - + if (j) { + begin = getindex(curln-1); + end = getindex(nextln(curln-1)); + } else { + begin = getindex(curln); + end = getindex(nextln(curln)); + } while (*s) { k = makeline(s, &off); s += off; @@ -636,7 +640,7 @@ doread(char *fname) s[n-1] = '\n'; s[n] = '\0'; } - inject(s); + inject(s, 0); } if (optdiag) printf("%zu\n", cnt); @@ -753,7 +757,7 @@ append(int num) while (getline(&s, &len, stdin) > 0) { if (*s == '.' && s[1] == '\n') break; - inject(s); + inject(s, 0); } free(s); } @@ -818,7 +822,7 @@ join(void) s = addchar('\n', s, &cap, &len); s = addchar('\0', s, &cap, &len); delete(line1, line2); - inject(s); + inject(s, 1); free(s); } @@ -845,7 +849,7 @@ copy(int where) curln = where; for (i = line1; i <= line2; ++i) - inject(gettxt(i)); + inject(gettxt(i), 0); } static void @@ -1025,7 +1029,7 @@ subline(int num, int nth) addpost(&s, &cap, &siz); delete(num, num); curln = prevln(num); - inject(s); + inject(s, 0); } static void -- 2.10.0
>From 977008c84e74f0c0fc1c4655ccd0b35920f0b5a3 Mon Sep 17 00:00:00 2001 From: Thomas Mannay <audiobarr...@openmailbox.org> Date: Sun, 9 Oct 2016 23:13:13 +0000 Subject: [PATCH 4/5] ed: remove double free in join() --- ed.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ed.c b/ed.c index d123814..de5321f 100644 --- a/ed.c +++ b/ed.c @@ -809,9 +809,8 @@ join(void) int i; char *t, c; size_t len = 0, cap = 0; - static char *s; + char *s; - free(s); for (s = NULL, i = line1;; i = nextln(i)) { for (t = gettxt(i); (c = *t) != '\n'; ++t) s = addchar(*t, s, &cap, &len); -- 2.10.0
>From 7740d822cd5d52fd0abd5c8350987345c610309a Mon Sep 17 00:00:00 2001 From: Thomas Mannay <audiobarr...@openmailbox.org> Date: Sun, 9 Oct 2016 23:14:54 +0000 Subject: [PATCH 5/5] ed: add manpage --- ed.1 | 210 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 209 insertions(+), 1 deletion(-) diff --git a/ed.1 b/ed.1 index 93e3012..50351e2 100644 --- a/ed.1 +++ b/ed.1 @@ -6,4 +6,212 @@ .Nd text editor .Sh SYNOPSIS .Nm -is the standard text editor. +.Op Fl s +.Op Fl p Ar string +.Op Ar file +.Sh DESCRIPTION +.Nm +is the standard text editor. It performs line-oriented operations on a buffer; +The buffer's contents are manipulated in command mode and text is written to the +buffer in input mode. Command mode is the default. To exit input mode enter a +dot ('.') on a line of its own. + +If +.Nm +is invoked with a file as an argument, it will simulate an edit command and read +the file's contents into a buffer. Changes to this buffer are local to +.Nm +until a write command is given. + +.Nm +uses the basic regular expression syntax and allows any character but space and +newline to be used as a delimiter in regular expressions. +.Sh OPTIONS +.Bl -tag -width Ds +.It Fl s +Suppress diagnostic messages +.It Fl p Ar string +Use +.Ar string +as a prompt when in command mode +.El +.Sh EXTENDED DESCRIPTION +.Ss Addresses +Commands operate on addresses. Addresses are used to refer to lines +within the buffer. Address ranges may have spaces before and after the separator. +Unless otherwise specified, 0 is an invalid address. The following symbols are +valid addresses: +.Bl -tag -width Ds +.It n +The nth line. +.It . +The current line, or "dot". +.It $ +The last line. +.It + +The next line. +.It +n +The nth next line. +.It ^ or - +The previous line. +.It ^n or -n +The nth previous line. +.It x,y +The range of lines from x to y. The default value of x is 1, and the default +value of y is $. +.It x;y +As above, except that the current line is set to x. Omitting x in this case uses +the current line as the default value. +.It /re/ +The next line matching re. +.It ?re? +The last line matching re. +.It 'c +The line marked by c. See k below. +.El +.Ss Commands. +.Nm +expects to see one command per line, with the following exception: commands may +be suffixed with either a list, number, or print command. These suffixed +commands are run after the command they're suffixed to has executed. + +The following is the list of commands that +.Nm +knows about. The parentheses contain the default addresses that a command uses. +.Bl -tag -width Ds +.It (.)a +Append text after the addressed line. The dot is set to the last line +entered. If no text was entered, the dot is set to the addressed line. An +address of 0 appends to the start of the buffer. +.It (.,.)c +Delete the addressed lines and then accept input to replace them. The dot +is set to the last line entered. If no text was entered, the dot is set to +the line before the deleted lines. +.It (.,.)d +Delete the addressed lines. If there is a line after the deleted range, the +dot is set to it. Otherwise, the dot is set to the line before the deleted range. +.It e Ar file +Delete the contents of the buffer and load in +.Ar file +for editing, printing the bytes read to standard output. If no filename is +given, +.Nm +uses the currently remembered filename. The remembered filename is set to +.Ar file +for later use. +.It E Ar file +As above, but without warning if the current buffer has unsaved changes. +.It f Ar file +Set the currently remembered filename to +.Ar +file +, or print the currently remembered filename if +.Ar +file is omitted. +.It (1,$)g/re/command +Apply command to lines matching re. The dot is set to the matching line before +command is executed. When each matching line has been operated on, the dot is +set to the last line operated on. If no lines match then the dot remains +unchanged. The command used may not be g, G, v, or V. +.It (1,$)G/re/ +Interactively edit the range of line addresses that match re. The dot is set to +the matching line and printed before a command is input. When each matching line +has been operated on, the dot is set to the last line operated on. If no lines +match then the dot remains unchanged. The command used may not be a, c, i, g, +G, v, or V. +.It h +Print the reason for the most recent error. +.It H +Toggle error explanations. If on, the above behaviour is produced on all +subsequent errors. +.It (.)i +Insert text into the buffer before the addressed line. The dot is set to the +last line entered. If no text was entered, the dot is set to the addressed line +.It (.,.+1)j +Join two lines together. If only one address is given, nothing happens. The dot +is set to the newly joined line. +.It (.)kc +Mark the line with the lower case character c. The dot is unchanged. +.It (.,.)l +Unambiguously print the addressed lines. The dot is set to the last line written. +.It (.,.)m(.) +Move lines in the buffer to the line address on the right hand side. An address +of 0 on the right hand side moves to the start of the buffer. The dot is set to +the last line moved. +.It (.,.)n +Print the addressed lines and their numbers. The dot is set to the last line +printed. +.It (.,.)p +Print the addressed lines. The dot is set to the last line printed. +.It P +Toggle the prompt. Defaults to off, but is switched on if the -p flag is used. +.It q +Quit +.Nm +, warning if there are unsaved changes. +.It Q +As above, but without warning if the current buffer has unsaved changes. +.It ($)r Ar file +Read in +.Ar file +and append it to the current buffer, printing the bytes read to standard output. +The currently remembered filename isn't changed unless it's empty. An address of +0 reads the file into the start of the buffer. +.It (.,.)s/re/replacement/flags +Substitute re for replacement in lines matching re. An & within replacement is +replaced with the whole string matched by re. Backrefs can be used with the form +\\n, where n is a positive non-zero integer. When % is the only character in +replacement, it is substituted for the replacement string from the last +substitute command. If a newline is part of replacement then the matched string +is split into two lines; this cannot be done as part of a g or v command. If +flags contains an integer n, then the nth match is replaced. If flags contains +g, all matches are replaced. The dot is set to the last line matched. +.It (.,.)t(.) +As m, but copying instead of moving. The dot is set to the last line added. +.It u +Undo the last change. The dot is set to whatever it was before the undone +command was performed. +.It (1.$)v/re/command +As with g, but operating on lines that don't match re. +.It (1.$)V/re/ +As with G, but operating on lines that don't match re. +.It (1,$)w Ar file +Write the addressed lines to +.Ar file +, overwriting its previous contents if the file exists, and print the number of +bytes written. If no filename is given the currently remembered filename will be +used instead. The dot is unchanged. +.It (1,$)W Ar file +As above, but instead of overwriting the contents of +.Ar file +the addressed lines are appended to +.Ar file +instead. +.It (.+1)\\n +Print the addressed line. Sets the dot to that line. +.It ($)= +Print the line number of the addressed line. The dot is unchanged. +.It & +Repeat the last command. +.It ! Ar command +Execute +.Ar command +using sh. If the first character of +.Ar command +is '!' then it is replaced with the text of the previous command. An unescaped % +is replaced with the currently remembered filename. ! does not process escape +characters. When +.Ar command +returns a '!' is printed. The dot is unchanged. +.El +.Sh STANDARDS +The +.Nm +utility is compliant with the +.St -p1003.1-2013 +specification, except where noted here: +g and v operate on single commands rather than lists delimited with '\\'. +e, E, r, w, and W commands cannot accept shell escapes. +.Sh SEE ALSO +.Xr sed 1 +.Xr regexp 3 -- 2.10.0