toybox: toys/pending/sed.c annotate

annotate toys/pending/sed.c @ 1550:2997847aa299 draft

Implement another largeish chunk of sed. Untested, unfinished, do not use yet.

author	Rob Landley <rob@landley.net>
date	Mon, 10 Nov 2014 17:17:17 -0600
parents	b6ff5dc17763
children	57ee7711a0c9

rev	line source
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	1 /* sed.c - stream editor. Thing that does s/// and other stuff.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 231 diff changeset	2 *
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	3 * Copyright 2014 Rob Landley <rob@landley.net>
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	4 *
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	5 * See http://pubs.opengroup.org/onlinepubs/9699919799/utilities/sed.html
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 231 diff changeset	6
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	7 USE_SED(NEWTOY(sed, "(version)efinr", TOYFLAG_USR\|TOYFLAG_BIN\|TOYFLAG_LOCALE))
234 163498bf547b Move NEWTOY() list from end of toylist.h to generated/newtoys.h. Rob Landley <rob@landley.net> parents: 233 diff changeset	8
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 231 diff changeset	9 config SED
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	10 bool "sed"
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	11 default n
786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	12 help
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	13 usage: sed [-inr] [-e SCRIPT]...\|SCRIPT [-f SCRIPT_FILE]... [FILE...]
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	14
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	15 Stream editor. Apply one or more editing SCRIPTs to each line of input
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	16 (from FILE or stdin) producing output (by default to stdout).
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 231 diff changeset	17
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	18 -e add SCRIPT to list
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	19 -f add contents of SCRIPT_FILE to list
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	20 -i Edit each file in place.
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	21 -n No default output. (Use the p command to output matched lines.)
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	22 -r Use extended regular expression syntax.
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	23 -s Treat input files separately (implied by -i)
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	24
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	25 A SCRIPT is a series of one or more COMMANDs separated by newlines or
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	26 semicolons. All -e SCRIPTs are concatenated together as if separated
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	27 by newlines, followed by all lines from -f SCRIPT_FILEs, in order.
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	28 If no -e or -f SCRIPTs are specified, the first argument is the SCRIPT.
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	29
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	30 Each COMMAND may be preceded by an address which limits the command to
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	31 apply only to the specified line(s). Commands without an address apply to
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	32 every line. Addresses are of the form:
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	33
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	34 [ADDRESS[,ADDRESS]]COMMAND
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	35
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	36 The ADDRESS may be a decimal line number (starting at 1), a /regular
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	37 expression/ within a pair of forward slashes, or the character "$" which
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	38 matches the last line of input. (In -s or -i mode this matches the last
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	39 line of each file, otherwise just the last line of the last file.) A single
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	40 address matches one line, a pair of comma separated addresses match
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	41 everything from the first address to the second address (inclusive). If
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	42 both addresses are regular expressions, more than one range of lines in
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	43 each file can match.
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	44
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	45 REGULAR EXPRESSIONS in sed are started and ended by the same character
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	46 (traditionally / but anything except a backslash or a newline works).
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	47 Backslashes may be used to escape the delimiter if it occurs in the
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	48 regex, and for the usual printf escapes (\abcefnrtv and octal, hex,
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	49 and unicode). An empty regex repeats the previous one. ADDRESS regexes
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	50 (above) require the first delimeter to be escaped with a backslash when
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	51 it isn't a forward slash (to distinguish it from the COMMANDs below).
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	52
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	53 Sed mostly operates on individual lines one at a time. It reads each line,
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	54 processes it, and either writes it to the output or discards it before
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	55 reading the next line. Sed can remember one additional line in a separate
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	56 buffer (using the h, H, g, G, and x commands), and can read the next line
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	57 of input early (using the n and N command), but other than that command
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	58 scripts operate on individual lines of text.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	59
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	60 Each COMMAND starts with a single character. The following commands take
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	61 no arguments:
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	62
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	63 { Start a new command block, continuing until a corresponding "}".
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	64 Command blocks may nest. If the block has an address, commands within
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	65 the block are only run for lines within the block's address range.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	66
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	67 } End command block (this command cannot have an address)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	68
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	69 d Delete this line and move on to the next one
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	70 (ignores remaining COMMANDs)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	71
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	72 D Delete one line of input and restart command SCRIPT (same as "d"
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	73 unless you've glued lines together with "N" or similar)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	74
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	75 g Get remembered line (overwriting current line)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	76
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	77 G Get remembered line (appending to current line)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	78
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	79 h Remember this line (overwriting remembered line)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	80
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	81 H Remember this line (appending to remembered line, if any)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	82
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	83 l Print this line, escaping \abfrtv (but leaving \n as a newline),
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	84 using octal escapes for other nonprintable characters, and
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	85 wrapping lines to terminal width with a backslash and newline
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	86
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	87 n Print default output and read next line, replacing current line
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	88 (If no next line available, quit processing script)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	89
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	90 N Append next line of input to this line, separated by a newline
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	91 (This advances the line counter for address matching and "=", if no
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	92 next line available quit processing script without default output)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	93
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	94 p Print this line
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	95
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	96 P Print this line up to first newline (from "N")
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	97
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	98 q Quit (print default output, no more commands processed or lines read)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	99
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	100 x Exchange this line with remembered line (overwrite in both directions)
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	101
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	102 = Print the current line number (followed by a newline)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	103
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	104 The following commands (may) take an argument. The "text" arguments (to
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	105 the "a", "b", and "c" commands) may end with an unescaped "\" to append
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	106 the next line (for which leading whitespace is not skipped), and also
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	107 treat ";" as a literal character (use "\;" instead).
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	108
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	109 a [text] Append text to output before attempting to read next line
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	110
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	111 b [label] Branch, jumps to :label (or with no label, to end of SCRIPT)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	112
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	113 c [text] Delete line, output text at end of matching address range
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	114 (ignores remaining COMMANDs)
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	115
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	116 i [text] Print text
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	117
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	118 r [file] Append contents of file to output before attempting to read
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	119 next line.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	120
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	121 s/S/R/F Search for regex S, replace matched text with R using flags F.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	122 The first character after the "s" (anything but newline or
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	123 backslash) is the delimiter, escape with \ to use normally.
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	124
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	125 The replacement text may contain "&" to substitute the matched
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	126 text (escape it with backslash for a literal &), or \1 through
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	127 \9 to substitute a parenthetical subexpression in the regex.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	128 You can also use the normal backslash escapes such as \n and
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	129 a backslash at the end of the line appends the next line.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	130
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	131 The flags are:
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	132
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	133 [0-9] A number, substitute only that occurrence of pattern
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	134 g Global, substitute all occurrences of pattern
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	135 i Ignore case when matching
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	136 p Print the line if match was found and replaced
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	137 w [file] Write (append) line to file if match replaced
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	138
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	139 t [label] Test, jump to :label only if an "s" command found a match in
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	140 this line since last test (replacing with same text counts)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	141
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	142 T [label] Test false, jump only if "s" hasn't found a match.
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	143
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	144 w [file] Write (append) line to file
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	145
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	146 y/old/new/ Change each character in 'old' to corresponding character
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	147 in 'new' (with standard backslash escapes, delimiter can be
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	148 any repeated character except \ or \n)
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	149
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	150 : [label] Labeled target for jump commands
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	151
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	152 # Comment, ignore rest of this line of SCRIPT
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	153
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	154 Deviations from posix: allow extended regular expressions with -r,
1537 a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	155 editing in place with -i, separate with -s, printf escapes in text, line
a6ef79b31829 Fill out rest of help text for sed. Rob Landley <rob@landley.net> parents: 1532 diff changeset	156 continuations, semicolons after all commands, 2-address anywhere an
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	157 address is allowed, "T" command, multiline continuations for [abc],
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	158 \; to end [abc] argument before end of line.
233 d4176f3f3835 Zap toys/Config.in and instead create generated/Config.in from contents of Rob Landley <rob@landley.net> parents: 231 diff changeset	159 */
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	160
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	161 #define FOR_sed
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	162 #include "toys.h"
31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	163
674 7e846e281e38 New build infrastructure to generate FLAG_ macros and TT alias, #define FOR_commandname before #including toys.h to trigger it. Rename DEFINE_GLOBALS() to just GLOBALS() (because I could never remember if it was DECLARE_GLOBALS). Convert existing commands to use new infrastructure, and replace optflag constants with FLAG_ macros where appropriate. Rob Landley <rob@landley.net> parents: 656 diff changeset	164 GLOBALS(
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	165 struct arg_list *f;
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	166 struct arg_list *e;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	167
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	168 // processed pattern list
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	169 struct double_list *pattern;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	170
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	171 char nextline, remember;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	172 void *restart;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	173 long nextlen, rememberlen, count;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	174 int fdout, noeol;
237 7cb15eae1664 Zap toylist.h, moving contents of global structures into DEFINE_GLOBALS() Rob Landley <rob@landley.net> parents: 234 diff changeset	175 )
7cb15eae1664 Zap toylist.h, moving contents of global structures into DEFINE_GLOBALS() Rob Landley <rob@landley.net> parents: 234 diff changeset	176
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	177 struct step {
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	178 struct step next, prev;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	179
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	180 // Begin and end of each match
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	181 long lmatch[2];
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	182 int rmatch[2]; // offset to regex_t, because realloc() would confuse pointer
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	183 unsigned not, hit, sflags;
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	184
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	185 int arg1, arg2, arg3; // offset start of to argument (string or regex_t)
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	186 char c; // action
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	187 };
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	188
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	189 // Write out line with potential embedded NUL, handling eol/noeol
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	190 static int emit(char *line, long len, int eol)
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	191 {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	192 if (TT.noeol && !writeall(TT.fdout, "\n", 1)) return 1;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	193 if (eol) line[len++] = '\n';
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	194 TT.noeol = len && !eol;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	195 if (len && len != writeall(TT.fdout, line, len)) {
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	196 perror_msg("short write");
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	197
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	198 return 1;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	199 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	200
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	201 return 0;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	202 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	203
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	204 // Do regex matching handling embedded NUL bytes in string. Note that
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	205 // neither the pattern nor the match can currently include NUL bytes
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	206 // (even with wildcards) and string must be nul terminated.
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	207 static int ghostwheel(regex_t preg, char string, long len, int nmatch,
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	208 regmatch_t pmatch[], int eflags)
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	209 {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	210 /*
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	211 // todo: this
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	212 long start = 0, rc = 0, matches = 0;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	213
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	214 for (;;) {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	215 long new = strlen(string+start);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	216
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	217 // eflags nobegin noend
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	218 rc \|= regexec(preg, string+start, nmatch-matches, pmatch+matches, eflags);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	219 if ((start += end + 1) >= len) break;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	220 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	221
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	222 return rc;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	223 */
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	224 return regexec(preg, string, nmatch, pmatch, eflags);
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	225
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	226 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	227
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	228 // Extend allocation to include new string, with newline between if newlen<0
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	229
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	230 static char extend_string(char old, char new, int oldlen, int newlen)
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	231 {
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	232 int newline = newlen < 0;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	233 char *s;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	234
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	235 if (newline) newlen = -newlen;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	236 s = old = xrealloc(old, oldlen+newlen+newline+1);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	237 if (newline) s[oldlen++] = '\n';
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	238 memcpy(s+oldlen, new, newlen);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	239 s[oldlen+newlen] = 0;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	240
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	241 return s+oldlen+newlen;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	242 }
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	243
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	244 // Apply pattern to line from input file
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	245 static void walk_pattern(char **pline, long plen)
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	246 {
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	247 struct append {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	248 struct append next, prev;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	249 int file;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	250 char *str;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	251 } *append;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	252 char *line = TT.nextline;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	253 long len = TT.nextlen;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	254 struct step *logrus;
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	255 int eol = 0, tea = 0;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	256
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	257 // Grab next line for deferred processing (EOF detection: we get a NULL
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	258 // pline at EOF to flush last line). Note that only end of _last_ input
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	259 // file matches $ (unless we're doing -i).
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	260 if (pline) {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	261 TT.nextline = *pline;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	262 TT.nextlen = plen;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	263 *pline = 0;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	264 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	265
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	266 if (!line \|\| !len) return;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	267 if (line[len-1] == '\n') line[--len] = eol++;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	268 TT.count++;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	269
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	270 logrus = TT.restart ? TT.restart : (void *)TT.pattern;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	271 TT.restart = 0;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	272 while (logrus) {
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	273 char *str, c = logrus->c;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	274
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	275 // Have we got a matching range for this rule?
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	276 if (logrus->lmatch \|\| logrus->rmatch) {
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	277 int miss = 0;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	278 long lm;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	279
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	280 // In a match that might end?
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	281 if (logrus->hit) {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	282 if (!(lm = logrus->lmatch[1])) {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	283 if (!logrus->rmatch[1]) logrus->hit = 0;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	284 else {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	285 void rm = logrus->rmatch[1] + (char )logrus;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	286
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	287 // regex match end includes matching line, so defer deactivation
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	288 if (!ghostwheel(rm, line, len, 0, 0, 0)) miss = 1;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	289 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	290 } else if (lm > 0 && lm < TT.count) logrus->hit = 0;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	291
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	292 // Start a new match?
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	293 } else {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	294 if (!(lm = *logrus->lmatch)) {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	295 void rm = logrus->rmatch + (char *)logrus;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	296
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	297 if (!ghostwheel(rm, line, len, 0, 0, 0)) logrus->hit++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	298 } else if (lm == TT.count \|\| (lm == -1 && !pline)) logrus->hit++;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	299 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	300
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	301 // Didn't match?
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	302 if (!(logrus->hit ^ logrus->not)) {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	303
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	304 // Handle skipping curly bracket command group
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	305 if (c == '{') {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	306 int curly = 1;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	307
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	308 while (curly) {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	309 logrus = logrus->next;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	310 if (logrus->c == '{') curly++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	311 if (logrus->c == '}') curly--;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	312 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	313 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	314 continue;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	315 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	316 // Deferred disable from regex end match
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	317 if (miss) logrus->hit = 0;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	318 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	319
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	320 // Process command
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	321
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	322 if (c=='a' \|\| c=='r') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	323 struct append *a = xzalloc(sizeof(struct append));
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	324 a->str = logrus->arg1+(char *)logrus;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	325 a->file = c== 'r';
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	326 dlist_add_nomalloc((void )&append, (void )a);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	327 } else if (c=='b' \|\| c=='t' \|\| c=='T') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	328 if (c=='b' \|\| tea^(c=='T')) {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	329 str = logrus->arg1+(char *)logrus;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	330
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	331 if (!*str) break;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	332 for (logrus = (void *)TT.pattern; logrus; logrus = logrus->next)
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	333 if (logrus->c == ':' && !strcmp(logrus->arg1+(char *)logrus, str))
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	334 break;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	335 if (!logrus) error_exit("no :%s", str);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	336 }
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	337 } else if (c=='c') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	338 str = logrus->arg1+(char *)logrus;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	339 if (!logrus->hit) emit(str, strlen(str), 1);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	340 goto done;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	341 } else if (c=='d') goto done;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	342 else if (c=='D') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	343 // Delete up to \n or end of buffer
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	344 for (str = line; !str \|\| str=='\n'; str++);
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	345 len -= str - line;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	346 memmove(line, str, len);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	347 line[len] = 0;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	348
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	349 // restart script
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	350 logrus = (void *)TT.pattern;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	351 continue;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	352 } else if (c=='g') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	353 free(line);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	354 line = xstrdup(TT.remember);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	355 len = TT.rememberlen;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	356 } else if (c=='G') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	357 line = xrealloc(line, len+TT.rememberlen+2);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	358 line[len++] = '\n';
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	359 memcpy(line+len, TT.remember, TT.rememberlen);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	360 line[len += TT.rememberlen] = 0;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	361 } else if (c=='h') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	362 free(TT.remember);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	363 TT.remember = xstrdup(line);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	364 TT.rememberlen = len;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	365 } else if (c=='H') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	366 TT.remember = xrealloc(TT.remember, TT.rememberlen+len+2);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	367 TT.remember[TT.rememberlen++] = '\n';
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	368 memcpy(TT.remember+TT.rememberlen, line, len);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	369 TT.remember[TT.rememberlen += len] = 0;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	370 } else if (c=='i') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	371 str = logrus->arg1+(char *)logrus;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	372 emit(str, strlen(str), 1);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	373 // } else if (c=='l') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	374 // error_exit("todo: l");
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	375 } else if (c=='n') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	376 TT.restart = logrus->next;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	377
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	378 break;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	379 } else if (c=='N') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	380 if (pline) {
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	381 TT.restart = logrus->next;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	382 extend_string(&line, TT.nextline, plen, -TT.nextlen);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	383 free(TT.nextline);
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	384 TT.nextline = line;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	385 line = 0;
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	386 }
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	387
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	388 goto done;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	389 } else if (c=='p') {
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	390 if (emit(line, len, eol)) break;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	391 } else if (c=='q') break;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	392 // else if (c=='s') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	393 // tea = 1;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	394 // }
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	395 else if (c=='w') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	396 int fd = TT.fdout, noeol = TT.noeol;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	397
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	398 TT.fdout = logrus->arg2;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	399 TT.noeol = logrus->arg3;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	400
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	401 if (emit(line, len, eol))
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	402 perror_exit("w '%s'", logrus->arg1+(char *)logrus);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	403 logrus->arg3 = TT.noeol;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	404 TT.noeol = noeol;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	405 TT.fdout = fd;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	406 } else if (c=='x') {
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	407 long swap = TT.rememberlen;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	408
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	409 str = TT.remember;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	410 TT.remember = line;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	411 line = str;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	412 TT.rememberlen = len;
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	413 len = swap;
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	414 // } else if (c=='y') {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	415 } else if (c=='=') xprintf("%ld\n", TT.count);
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	416 // labcirstTwy
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	417 else if (c!=':') error_exit("todo: %c", c);
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	418
b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	419 logrus = logrus->next;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	420 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	421
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	422 if (!(toys.optflags & FLAG_n)) emit(line, len, eol);
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	423
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	424 done:
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	425 free(line);
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	426
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	427 if (dlist_terminate(append)) while (append) {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	428 struct append *a = append->next;
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	429
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	430 if (append->file) {
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	431 int fd = xopen(append->str, O_RDONLY);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	432
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	433 // Force newline if noeol pending
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	434 emit(0, 0, 0);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	435 xsendfile(fd, TT.fdout);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	436 close(fd);
2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	437 } else emit(append->str, strlen(append->str), 1);
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	438 free(append);
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	439 append = a;
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	440 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	441 }
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	442
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	443 // Genericish function, can probably get moved to lib.c
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	444
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	445 // Iterate over lines in file, calling function. Function can write NULL to
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	446 // the line pointer if they want to keep it, otherwise line is freed.
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	447 // Passed file descriptor is closed at the end of processing.
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	448 static void do_lines(int fd, char name, void (call)(char **pline, long len))
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	449 {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	450 FILE *fp = fd ? xfdopen(fd, "r") : stdin;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	451
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	452 for (;;) {
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	453 char *line = 0;
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	454 ssize_t len;
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	455
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	456 len = getline(&line, (void *)&len, fp);
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	457 if (len > 0) {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	458 call(&line, len);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	459 free(line);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	460 } else break;
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	461 }
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	462
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	463 if (fd) fclose(fp);
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	464 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	465
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	466 // Iterate over newline delimited data blob (potentially with embedded NUL),
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	467 // call function on each line.
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	468 static void chop_lines(char data, long len, void (call)(char **p, long l))
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	469 {
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	470 long ll;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	471
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	472 for (ll = 0; ll < len; ll++) {
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	473 if (data[ll] == '\n') {
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	474 char *c = data;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	475
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	476 data[ll] = 0;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	477 call(&c, len);
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	478 data[ll++] = '\n';
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	479 data += ll;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	480 len -= ll;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	481 ll = -1;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	482 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	483 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	484 if (len) call(&data, len);
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	485 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	486
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	487 static void do_sed(int fd, char *name)
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	488 {
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	489 int i = toys.optflags & FLAG_i;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	490
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	491 if (i) {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	492 // todo: rename dance
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	493 }
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	494 do_lines(fd, name, walk_pattern);
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	495 if (i) {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	496 walk_pattern(0, 0);
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	497
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	498 // todo: rename dance
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	499 }
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	500 }
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	501
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	502 // Note: removing backslash escapes edits the source string, which could
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	503 // be from the environment space via -e, which could screw up what
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	504 // "ps" sees, and I'm ok with that.
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	505
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	506 // extract regex up to delimeter, converting \escapes
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	507 // You can't use \ as delimiter because how would you escape anything?
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	508 static int parse_regex(regex_t reg, char *pstr, char delim)
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	509 {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	510 char to, from = *pstr;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	511 int rc;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	512
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	513 if (delim == '\\') rc = 0;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	514 else {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	515 for (to = from; from != delim; (to++) = *(from++)) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	516 if (!*from) break;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	517 if (*from == '\\') {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	518 if (!from[1]) break;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	519
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	520 // Check escaped end delimiter before printf style escapes.
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	521 if (from[1] == delim) from++;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	522 else {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	523 char c = unescape(from[1]);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	524
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	525 if (c) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	526 *to = c;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	527 from++;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	528 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	529 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	530 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	531 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	532 rc = (*from == delim);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	533 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	534
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	535 if (rc) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	536 delim = *to;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	537 *to = 0;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	538 xregcomp(reg, pstr, ((toys.optflags & FLAG_r)REG_EXTENDED)\|REG_NOSUB);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	539 *to = delim;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	540 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	541 *pstr = from + rc;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	542
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	543 return rc;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	544 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	545
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	546 // Translate primal pattern into walkable form.
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	547 static void jewel_of_judgement(char **pline, long len)
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	548 {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	549 struct step corwin = (void )TT.pattern;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	550 char line = pline, *reg, c;
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	551 int i;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	552
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	553 // Append additional line to pattern argument string?
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	554 if (corwin && corwin->prev->hit) {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	555 // Remove half-finished entry from list so remalloc() doesn't confuse it
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	556 TT.pattern = TT.pattern->prev;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	557 corwin = dlist_pop(&TT.pattern);
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	558 corwin->hit = 0;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	559 c = corwin->c;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	560 reg = (char *)corwin;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	561 reg += corwin->arg1 + strlen(reg + corwin->arg1);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	562
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	563 // Resume parsing
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	564 goto append;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	565 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	566
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	567 // Loop through commands in line
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	568
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	569 corwin = 0;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	570 for (;;) {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	571 if (corwin) dlist_add_nomalloc(&TT.pattern, (void *)corwin);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	572
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	573 while (isspace(line) \|\| line == ';') line++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	574 if (!line \|\| line == '#') return;
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	575
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	576 memset(toybuf, 0, sizeof(struct step));
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	577 corwin = (void *)toybuf;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	578 reg = toybuf + sizeof(struct step);
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	579
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	580 // Parse address range (if any)
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	581 for (i = 0; i < 2; i++) {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	582 if (*line == ',') line++;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	583 else if (i) break;
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	584
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	585 if (isdigit(*line)) corwin->lmatch[i] = strtol(line, &line, 0);
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	586 else if (*line == '$') {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	587 corwin->lmatch[i] = -1;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	588 line++;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	589 } else if (line == '/' \|\| line == '\\') {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	590 char delim = *(line++);
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	591
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	592 if (delim == '\\') {
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	593 if (!*line) goto brand;
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	594 delim = *(line++);
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	595 }
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	596
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	597 if (!parse_regex((void *)reg, &line, delim)) goto brand;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	598 corwin->rmatch[i] = reg-toybuf;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	599 reg += sizeof(regex_t);
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	600 } else break;
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	601 }
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	602
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	603 while (isspace(*line)) line++;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	604 if (!*line) break;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	605
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	606 while (*line == '!') corwin->not = 1;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	607 while (isspace(*line)) line++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	608
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	609 c = corwin->c = *(line++);
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	610 if (strchr("}:", c) && i) break;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	611 if (strchr("aiqr=", c) && i>1) break;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	612
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	613 // Add step to pattern
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	614 corwin = xmalloc(reg-toybuf);
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	615 memcpy(corwin, toybuf, reg-toybuf);
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	616 reg = (reg-toybuf) + (char *)corwin;
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	617
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	618 // Parse arguments by command type
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	619 if (c == '{') TT.nextlen++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	620 else if (c == '}') {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	621 if (!TT.nextlen--) break;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	622 } else if (c == 's') {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	623 char delim = *line;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	624 int end;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	625
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	626 // s/pattern/replacement/flags
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	627
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	628 if (delim) line++;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	629 else break;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	630
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	631 // get pattern
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	632 end = reg - (char *)corwin;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	633 corwin = xrealloc(corwin, end+sizeof(regex_t));
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	634 reg = end + (char *)corwin;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	635 if (!parse_regex((void *)reg, &line, delim)) break;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	636 corwin->arg1 = reg-toybuf;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	637 reg += sizeof(regex_t);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	638
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	639 // get replacement
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	640
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	641 for (end = 0; line[end] != delim; end++) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	642 if (line[end] == '\\') end++;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	643 if (!line[end]) goto brand;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	644 }
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	645
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	646 corwin->arg2 = reg - (char*)corwin;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	647 reg = extend_string((void *)&corwin, line, corwin->arg2, end);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	648 line += end+1;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	649
1550 2997847aa299 Implement another largeish chunk of sed. Untested, unfinished, do not use yet. Rob Landley <rob@landley.net> parents: 1545 diff changeset	650 // parse s///flags
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	651 for (;;) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	652 long l;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	653
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	654 line++;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	655 if (!line \|\| line == ';') break;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	656 if (isspace(*line)) continue;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	657
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	658 if (0 <= (l = stridx("gpi", *line))) corwin->sflags \|= 1<<l;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	659 else if (!corwin->sflags >> 4 && 0<(l = strtol(line+end, &line, 10))) {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	660 corwin->sflags \|= l << 4;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	661 line--;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	662 } else if (*line == 'w') {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	663 while (isspace(*++line));
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	664 if (!*line) goto brand;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	665 corwin->arg3 = reg - (char *)corwin;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	666 reg = extend_string((void *)&corwin, line, corwin->arg3,
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	667 strlen(line));
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	668 } else goto brand;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	669 }
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	670 } else if (c == 'y') {
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	671 // y/old/new/
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	672 } else if (strchr("abcirtTw:", c)) {
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	673 int end, class;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	674
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	675 // Trim whitespace from "b ;" and ": blah " but only first space in "w x "
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	676
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	677 while (isspace(*line)) line++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	678 append:
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	679 class = !strchr("btT:", c);
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	680 end = strcspn(line, class ? "" : "; \t\r\n\v\f");
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	681
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	682 if (!end) {
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	683 if (!strchr("btT", c)) break;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	684 continue;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	685 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	686
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	687 // Extend allocation to include new string. We use offsets instead of
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	688 // pointers so realloc() moving stuff doesn't break things. Do it
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	689 // here instead of toybuf so there's no maximum size.
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	690
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	691 if (!corwin->arg1) corwin->arg1 = reg - (char*)corwin;
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	692 reg = extend_string((void )&corwin, line, reg - (char )corwin, end);
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	693
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	694 // Line continuation?
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	695 if (class && reg[-1] == '\\') {
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	696 reg[-1] = 0;
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	697 corwin->hit++;
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	698 }
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	699
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	700 // Commands that take no arguments
8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	701 } else if (!strchr("{dDgGhHlnNpPqx=", *line)) break;
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	702 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	703
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	704 brand:
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	705 // Reminisce about chestnut trees.
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	706 error_exit("bad pattern '%s'@%ld (%c)", pline, line-pline+1, *line);
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	707 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	708
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	709 void sed_main(void)
31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	710 {
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	711 struct arg_list *dworkin;
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	712 char **args = toys.optargs;
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	713
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	714 // Lie to autoconf when it asks stupid questions, so configure regexes
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	715 // that look for "GNU sed version %f" greater than some old buggy number
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	716 // don't fail us for not matching their narrow expectations.
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	717 if (toys.optflags & FLAG_version) {
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	718 xprintf("This is not GNU sed version 9.0\n");
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	719 return;
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	720 }
3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	721
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	722 // Need a pattern. If no unicorns about, fight serpent and take its eye.
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	723 if (!TT.e && !TT.f) {
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	724 if (!*toys.optargs) error_exit("no pattern");
dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	725 (TT.e = xzalloc(sizeof(struct arg_list)))->arg = *(args++);
694 786841fdb1e0 Reindent to two spaces per level. Remove vi: directives that haven't worked right in years (ubuntu broke its' vim implementation). Remove trailing spaces. Add/remove blank lines. Re-wordwrap in places. Update documentation with new coding style. Rob Landley <rob@landley.net> parents: 674 diff changeset	726 }
1543 ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	727
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	728 // Option parsing infrastructure can't interlace "-e blah -f blah -e blah"
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	729 // so handle all -e, then all -f. (At least the behavior's consistent.)
ad6b2f0e566b Next round of sed infrastructure, parses most commands now, doesn't implement them yet. Rob Landley <rob@landley.net> parents: 1538 diff changeset	730
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	731 for (dworkin = TT.e; dworkin; dworkin = dworkin->next)
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	732 chop_lines(dworkin->arg, strlen(dworkin->arg), jewel_of_judgement);
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	733 for (dworkin = TT.f; dworkin; dworkin = dworkin->next)
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	734 do_lines(xopen(dworkin->arg, O_RDONLY), dworkin->arg, jewel_of_judgement);
bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	735 dlist_terminate(TT.pattern);
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	736 if (TT.nextlen) error_exit("no }");
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	737
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	738 TT.fdout = 1;
1545 b6ff5dc17763 Implement a few sed commands. Not done, and not tested yet. Rob Landley <rob@landley.net> parents: 1543 diff changeset	739 TT.remember = xstrdup("");
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	740
1520 dfd6b3404c16 Started over on sed (by reading the posix spec). Rob Landley <rob@landley.net> parents: 1235 diff changeset	741 // Inflict pattern upon input files
1530 3eafa445c1a6 Random in-progress snapshot of sed, not finished yet. Rob Landley <rob@landley.net> parents: 1520 diff changeset	742 loopfiles_rw(args, O_RDONLY, 0, 0, do_sed);
1532 bf2c5216d726 Basic sed range support, enough for "sed -n 9,11p README" to work. Rob Landley <rob@landley.net> parents: 1530 diff changeset	743
1538 8bc715741481 Next drop of sed infrastructure, mostly argument parsing, doesn't do anything interesting yet. Rob Landley <rob@landley.net> parents: 1537 diff changeset	744 if (!(toys.optflags & FLAG_i)) walk_pattern(0, 0);
231 31dc682c18ad Very early stub of sed, does nothing yet. Rob Landley <rob@landley.net> parents: diff changeset	745 }

Mercurial > hg > toybox

annotate toys/pending/sed.c @ 1550:2997847aa299 draft